summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fingerprint: bump hw api version to 2.1 [DO NOT MERGE]android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r3android-7.1.2_r2android-7.1.2_r11android-7.1.2_r1Nick Desaulniers2017-01-271-1/+1
| | | | | | | | Bug: 34129808 Test: adb logcat | grep -i 'wrong fp' should be empty Change-Id: I2ddd3e31e221ceb829ba0e577c44dac20d26b85f
* bootstat: Fix false metrics due to soft reboots.James Hawkins2017-01-191-1/+19
| | | | | | | | | | Use a flag to enable/disable logging metrics, set to false during soft reboots. Bug: 32807863 Change-Id: Ib1359327af4e18d40400c29961c454f7be1b8d0c Test: None (cherry picked from commit 800ceb45b15c2b63edd4c699862653c55fe55ef2)
* dlext_namespace.h: Declare android_get_LD_LIBRARY_PATHJesse Hall2017-01-171-0/+13
| | | | | | | | | | This allows clients creating their own namespace do so by modifying the default library path, rather than hardcoding it multiple places in the system. Bug: 33531483 Change-Id: Id93059eed9f426b05178ecd65861f820300f0382 Merged-In: I321e219392b38c235b220986e1520b49a4669863
* Make dlext_namespaces.h available to users of libnativeloaderJesse Hall2017-01-172-1/+1
| | | | | | Bug: 33531483 Change-Id: Ie53309a08179770fa2b53b937580fe9e7acf748d Merged-In: I1da92e2b1437b6775a9d81fc6c1a2d4bacecbc04
* Merge "gatekeeperd: protect from invalid data passed by HAL" into nyc-mr2-devAlexey Polyudov2017-01-031-1/+8
|\
| * gatekeeperd: protect from invalid data passed by HALAlexey Polyudov2016-12-211-1/+8
| | | | | | | | | | | | Bug: 31349112 Change-Id: I6c0656f85e44054147f8795c98baab7a98f575b9 Signed-off-by: Alexey Polyudov <apolyudov@google.com>
* | adb: fix IOKit handle leaks on OS X.Josh Gao2017-01-031-0/+5
|/ | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=219085 Test: Removed sleep in RunLoopThread, compared before/after this patch Bug: http://b/33283523 (cherry picked from commit b6a2f595151dc6de850f7bc0e2aa5aec3db80213) Change-Id: Ia65bbedfb7d47bdb02bdfb69778784e5e855900b
* Allow bluetooth service to access bluetooth directory and add /logs (2/14)Ajay Panicker2016-12-121-1/+2
| | | | | | Bug: 31466840 Change-Id: I2c2766a2366600def81708d97cf3f3f13e0eb655 (cherry picked from commit 59d6a8cf8a4867a10f56b36057bffcc344715d3f)
* change /data/bugreports to /bugreports am: 04bbd5c6dd am: 8be42a8040 am: ↵Nick Kralevich2016-12-072-4/+1
|\ | | | | | | | | | | | | | | c740d0b56c am: 48d4fe138e Change-Id: I7d447d2b87937608a1cb8949b8065466a4b02e07
| * change /data/bugreports to /bugreports am: 04bbd5c6dd am: 8be42a8040Nick Kralevich2016-12-072-4/+1
| |\ | | | | | | | | | | | | | | | am: c740d0b56c Change-Id: I5a6bb69289ce44ea8b1e92a66a655d2e9d1e967e
| | * change /data/bugreports to /bugreports am: 04bbd5c6ddNick Kralevich2016-12-072-4/+1
| | |\ | | | | | | | | | | | | | | | | | | | | am: 8be42a8040 Change-Id: Ia28483d5847bebc308c87330e1cab47c8daab449
| | | * change /data/bugreports to /bugreportsNick Kralevich2016-12-072-4/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 04bbd5c6dd Change-Id: I3b83588438a747d5ba202f629fce83ac841f1043
| | | | * change /data/bugreports to /bugreportsNick Kralevich2016-12-072-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's 5 characters shorter, has no runtime costs, can be stored on a read-only partition, and avoids problems like b/27262109 and b/27204904. It allows makes some security hardening easier. (cherry picked from commit c4084c669495fd1b41ce8b6568c71b1f46d26969) Bug: 27262109 Bug: 27204904 Bug: 32799236 Test: verified new symlink created and old one not present Change-Id: Ief362e13569ad9c868a7f0f9c4dbd6a328c96c6b
* | | | | bootstat: Fix the boot complete signal for FBE devices.James Hawkins2016-12-021-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FBE devices suffice with bootanim=stopped, but must be gated on ro.crypto.type=file. Bug: 33049941 Test: adb reboot && adb logcat | grep bootstat < Has output Change-Id: I346d47aaf9d1d4b40f05906056849630b922a20d (cherry picked from commit e4079fbdefac654f84b091335cc67fd89d79841c)
* | | | | init: Fix sync issue on property trigger.caozhiyuan2016-11-301-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 876ad4571e Change-Id: Ie5958255e4a785c951cc04e47d139fe1ae719139
| * | | | init: Fix sync issue on property trigger.caozhiyuan2016-11-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue reproduces in the following senario. 1. ("", "") is added to queue; 2. property_triggers_enabled is set to 1; 3. user defined property is triggered, like sys.usb.config=adb; 4. ("sys.usb.config", "adb") is added to queue; 5. main loop interpret ("", "") and queue all current triggers to execution, so ("sys.usb.config", "adb") is queued for execution for the first time. 6. main loop interpret ("sys.usb.config", "adb"), it is queued for execution for a second time. The second time makes ASIT fail. (cherry pick from AOSP commit b104c502e1db80eda9751b0cba19e2e24fc0c3c0) Bug: http://b/28218187 Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1 Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
* | | | | Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d am: 79517d4f9f Change-Id: I78fe778bb69d3be0551e062602a3517ff0b3220a
| * | | | Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d Change-Id: I865faac0c4674fc9a1088781112881cc36515fa4
| | * | | Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed Change-Id: I228d82294d327907b1c8d42f5f359a8c5e8f6b2c
| | | * | Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a Change-Id: I99d8c36f47134503d30e6aa01d62d7788fd5a088
| | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 Change-Id: I62537211751b865364bacaf8cf9c1d1596e76332
| | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 Change-Id: I130be434938733fbc3f6ecb9c23f8cdaeac4dba4
| | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f Change-Id: I4f520495a4a286c00e221377926c02f3b91f4df1
| | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153
| | | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd Change-Id: I193387ccd84e4425070153a242ab320eb434b44b
| | | | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb Change-Id: I8498b7981b8b63905a80200880d9b8d778ecfaf2
| | | | | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 am: 8027acd140 Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4
| | | | | | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b4bd3feea am: 55d871c401 Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a
| | | | | | | | | | | | * Merge "adb: actually fix the windows build." into klp-dev am: da66b9100aJosh Gao2016-11-170-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0b4bd3feea Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5
| | | | | | | | | | | | | * Merge "adb: actually fix the windows build." into klp-devJosh Gao2016-11-170-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: da66b9100a Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
| | | | | | | | | | | | | | * Merge "adb: actually fix the windows build." into klp-devJosh Gao2016-11-171-1/+6
| | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 am: 8dab84a673 Change-Id: Ibc6f501754c79feaeb4f96594e74e0cdf0e25276
| * | | | | | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 Change-Id: Ib86183ef90f02018a75c1f95ddccd13cffeaf627
| | * | | | | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 Change-Id: If9c6dd2028c23d5be2f4a03112ec4435f4bcac0b
| | | * | | | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 Change-Id: Iccb5f9701c8d1bebdd78e1a8239366e7db7993dc
| | | | * | | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 Change-Id: Ie6f90d593cc9c5e3b89ba5734ca6719280f93a96
| | | | | * | | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 Change-Id: I1c63c85cbe10393adbee26133d6bcdaa87fda3aa
| | | | | | * | | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 Change-Id: I7175252aa53b9f133c880537cc0003c3cdd6c6f5
| | | | | | | * | | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9
| | | | | | | | * | | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d Change-Id: Id4c832f6ff9728e305a513d24f4378576e00fe6d
| | | | | | | | | * | | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786
| | | | | | | | | | * | | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: ↵Josh Gao2016-11-170-0/+0
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ceca95f8e am: 0d5c1a7745 -s ours Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a
| | | | | | | | | | | * | | | | adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7Josh Gao2016-11-171-0/+6
| | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ceca95f8e Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228
| | | | | | | | | | | | * | | | adb: actually fix the windows build. am: 58eda35aceJosh Gao2016-11-171-1/+6
| | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bbd6d7b3e7 Change-Id: I0d2553e19b3e96e9af4e0aa3493a4b8b36e55431
| | | | | | | | | | | | | * | | adb: actually fix the windows build.Josh Gao2016-11-171-1/+6
| | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 58eda35ace Change-Id: If917d578acb8a0b289369f7b5b1aca7deff4a4b9
| | | | | | | | | | | | | | * | adb: actually fix the windows build.Josh Gao2016-11-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/32292581 Change-Id: I714e1f47c2c2e89027989d485cb28891b905f931
* | | | | | | | | | | | | | | | fs_mgr: Fix disable-verity for verifyatboot partitionsPrashant Malani2016-11-161-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dd78ae75ff Change-Id: Ib59af63d80d92a04c5dbc16e5d81cd261475f064
| * | | | | | | | | | | | | | | fs_mgr: Fix disable-verity for verifyatboot partitionsPrashant Malani2016-11-151-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows a remount to be performed on partitions which have been verified at boot, without causing the verity service to complain of "corrupted" blocks that could have been modified as a result of a remount (while the verity checksum remained unchanged). Bug: 32638755 Change-Id: I77cf7dd20ee5c5f5dac80f73f292e32583fe5906
* | | | | | | | | | | | | | | | Merge "adb: turn darwin/windows builds back on, hopefully fix them." into ↵Josh Gao2016-11-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 am: b928a3485a Change-Id: I103114547136457dd076e73f34b4c0e305c68e69
| * | | | | | | | | | | | | | | Merge "adb: turn darwin/windows builds back on, hopefully fix them." into ↵Josh Gao2016-11-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 Change-Id: I2134fa1768433ec93eaf67062167d6f8bd7e5cab