Charles He
|
5da3442d27
|
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c" into nyc-mr2-dev-plus-aosp
am: 78129e30a4
Change-Id: I3a42d21df986dbaac5adb082d3bb85300461c15c
|
2016-12-29 11:49:33 +00:00 |
|
Charles He
|
970370a9b9
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c
am: d4dcbc44e9
Change-Id: Ie48ff56d0cd0a6981b2a38734df22a79fee72643
|
2016-12-29 11:49:21 +00:00 |
|
Charles He
|
5e8f5f32cd
|
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp
am: 35f1af792d
Change-Id: I0807ac49f3512299f684825e7383d2d6db01c8c2
|
2016-12-29 11:43:45 +00:00 |
|
Charles He
|
e0d1a6f2a3
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284
am: 4c57f6f500
Change-Id: I84c3e798f88439514d0faeaf0937d2648e07ee2e
|
2016-12-29 11:43:34 +00:00 |
|
Charles He
|
64e9bb46b2
|
Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp
am: 424aa97a10
Change-Id: Icba07b2f411be7aa7e75b68a595378334476e4f6
|
2016-12-29 11:38:41 +00:00 |
|
Charles He
|
5e9870f7de
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586
am: 503794154d
Change-Id: Ie906f7470d28a32e1f3cb3fcd1918f3ad47fe5e1
|
2016-12-29 11:38:32 +00:00 |
|
Charles He
|
bcf0dbcd5d
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 065e387455
am: fce4eb6810
Change-Id: I87a2d4fbeed47094cc27967b13e1950b3dedaf0e
|
2016-12-29 11:37:01 +00:00 |
|
Android Build Merger (Role)
|
b5a5a51623
|
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:28:50 +00:00 |
|
Android Build Merger (Role)
|
140ac4efb5
|
Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:28:24 +00:00 |
|
Charles He
|
7aa7ee7338
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff
am: 2c29250b44
Change-Id: Ia8f46f37277c4b2377cc232bb5879b815f221064
|
2016-12-29 11:28:03 +00:00 |
|
Charles He
|
cc2c82436e
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff
am: 171fa83224
Change-Id: I46f642c19a517e64ce46a02d5235e766eb1897be
|
2016-12-29 11:27:37 +00:00 |
|
Android Build Merger (Role)
|
2518cfcc59
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:27:37 +00:00 |
|
Android Build Merger (Role)
|
bf9a3b4b0d
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:27:10 +00:00 |
|
Charles He
|
ac437a2961
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231
am: 0881d980ad
Change-Id: I426adb43d8d1eabaf58fc70b9a4880fa93a813c1
|
2016-12-29 11:26:50 +00:00 |
|
Charles He
|
f2263e3a5e
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231
am: fdcec75c74
Change-Id: Ie3b37d91d938d3b6f11ee9fa4d909671340150ca
|
2016-12-29 11:26:23 +00:00 |
|
Android Build Merger (Role)
|
78129e30a4
|
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:26:22 +00:00 |
|
Android Build Merger (Role)
|
35f1af792d
|
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:25:59 +00:00 |
|
Charles He
|
d4dcbc44e9
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589
am: ccf6c25b3c
Change-Id: Icbad7a4d6c1fd66e94f132ad39b9de6763988e2a
|
2016-12-29 11:25:28 +00:00 |
|
Charles He
|
4c57f6f500
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589
am: e167e6d284
Change-Id: I036d794b37bad0418f0f667c33d09e605df9f69b
|
2016-12-29 11:25:11 +00:00 |
|
Android Build Merger (Role)
|
424aa97a10
|
Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp
|
2016-12-29 11:25:03 +00:00 |
|
Charles He
|
503794154d
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955
am: 22faa73586
Change-Id: I630b97aa9b3a5e9bbc88b49aeb61216ff9c37de6
|
2016-12-29 11:24:10 +00:00 |
|
Charles He
|
fce4eb6810
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955
am: 065e387455
Change-Id: Ic6182836cbc0bf547bcd6c6621a410c1e6d0ce8f
|
2016-12-29 11:23:57 +00:00 |
|
Ivan Podogov
|
06fc565d1e
|
Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours am: fd770e1cb8 am: b90fa0a5c3
am: 04a20f695d
Change-Id: I0633c7bf53319571af5a746725cdee5ad4b225ae
|
2016-12-29 11:23:55 +00:00 |
|
Charles He
|
2c29250b44
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a
am: 821fdbd3ff
Change-Id: Ic735b56728a9e8f8df25c22ed33135890e8b6f08
|
2016-12-29 11:20:39 +00:00 |
|
Charles He
|
171fa83224
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a
am: 821fdbd3ff
Change-Id: I3dab3f81346bd13b1ae343dd6e21a437b642a080
|
2016-12-29 11:20:16 +00:00 |
|
Charles He
|
0881d980ad
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578
am: 3ad5df5231
Change-Id: I4223d7df9ecdf7c39401fcaa9e7ec5b2ed3253a4
|
2016-12-29 11:19:27 +00:00 |
|
Charles He
|
fdcec75c74
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578
am: 3ad5df5231
Change-Id: I9c159162e18af0820c76d42c22e2ec001ab72c62
|
2016-12-29 11:19:07 +00:00 |
|
Charles He
|
ccf6c25b3c
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb
am: b5f3383589
Change-Id: Id728f54d83459d4a583a4b639529308667fd7f8e
|
2016-12-29 11:18:16 +00:00 |
|
Charles He
|
e167e6d284
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb
am: b5f3383589
Change-Id: I85ff02b53d1285d8e8a4e7c30ae9a988c52d6468
|
2016-12-29 11:18:04 +00:00 |
|
Charles He
|
22faa73586
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446
am: 08ea823955
Change-Id: I1526deabd38ef8ecbb841a7029b9539bb5f3aefc
|
2016-12-29 11:17:05 +00:00 |
|
Charles He
|
065e387455
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446
am: 08ea823955
Change-Id: I079501cac553468878a6642a64110f4de3e56698
|
2016-12-29 11:16:55 +00:00 |
|
Ivan Podogov
|
04a20f695d
|
Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours am: fd770e1cb8
am: b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
|
2016-12-29 11:16:50 +00:00 |
|
Ivan Podogov
|
b90fa0a5c3
|
Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours
am: fd770e1cb8
Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
|
2016-12-29 11:10:29 +00:00 |
|
Charles He
|
821fdbd3ff
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814
am: 596e3a9d1a
Change-Id: If8e61075126f4b8a5ccf5a29e2bd74fec222f2f6
|
2016-12-29 11:06:56 +00:00 |
|
Charles He
|
3ad5df5231
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2
am: b75b025578
Change-Id: Iff7b172dafedff0dcca720c4e7ca1c16e8c6a35c
|
2016-12-29 11:05:43 +00:00 |
|
Charles He
|
b5f3383589
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4
am: 835c1bcedb
Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745
|
2016-12-29 11:04:37 +00:00 |
|
Charles He
|
08ea823955
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad
am: 9bc2d6b446
Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
|
2016-12-29 11:03:26 +00:00 |
|
Ivan Podogov
|
fd770e1cb8
|
Merge "In permission review mode, always request user's consent to toggle BT."
am: 895e2d7a40 -s ours
Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
|
2016-12-29 11:03:21 +00:00 |
|
Charles He
|
596e3a9d1a
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04
am: b07ddf3814
Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e
|
2016-12-29 10:58:44 +00:00 |
|
Charles He
|
b75b025578
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc
am: e426dac4e2
Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7
|
2016-12-29 10:57:41 +00:00 |
|
Charles He
|
835c1bcedb
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216
am: c189f23dd4
Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
|
2016-12-29 10:56:32 +00:00 |
|
Charles He
|
9bc2d6b446
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f
am: dd7837c5ad
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
|
2016-12-29 10:55:23 +00:00 |
|
Charles He
|
b07ddf3814
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf
am: 0e2e913b04
Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32
|
2016-12-29 10:44:41 +00:00 |
|
Charles He
|
e426dac4e2
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c
am: 3cc7f6acdc
Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
|
2016-12-29 10:43:40 +00:00 |
|
Charles He
|
c189f23dd4
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15
am: 03fa83e216
Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
|
2016-12-29 10:42:32 +00:00 |
|
Charles He
|
dd7837c5ad
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0
am: 8bcdab7e6f
Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
|
2016-12-29 10:41:25 +00:00 |
|
Charles He
|
0e2e913b04
|
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb
am: 1d84f619bf
Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027
|
2016-12-29 10:37:45 +00:00 |
|
Charles He
|
3cc7f6acdc
|
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089
am: ced5ab190c
Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c
|
2016-12-29 10:36:32 +00:00 |
|
Charles He
|
03fa83e216
|
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5
am: 6bb6f02a15
Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7
|
2016-12-29 10:35:19 +00:00 |
|
Charles He
|
8bcdab7e6f
|
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9
am: 9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
|
2016-12-29 10:34:04 +00:00 |
|