OSDN Git Service
Tony Mak [Thu, 22 Dec 2016 11:02:45 +0000 (11:02 +0000)]
Make sure ServiceConnection callback is called in main thread
Fix:
33568999
Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases
--test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest
Change-Id: I14c8b5b1f78192429e68a3057430406245a909c8
Charles He [Thu, 29 Dec 2016 12:51:54 +0000 (12:51 +0000)]
Remove duplicate lines due to automerger
Test: make
Bug:
30352311
Change-Id: Ic476be8fca733414589202701fe91e5eb47e97fb
Selim Cinek [Thu, 29 Dec 2016 12:26:40 +0000 (12:26 +0000)]
Merge "Improved the behavior with the empty shade view"
Selim Cinek [Thu, 29 Dec 2016 12:26:03 +0000 (12:26 +0000)]
Merge "Fixed a bug where notifications could stay expanded"
Charles He [Thu, 29 Dec 2016 11:58:01 +0000 (11:58 +0000)]
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
am:
b5a5a51623
Change-Id: I6ceee43b87307b384cc3b6632b23d3859afa770a
Charles He [Thu, 29 Dec 2016 11:57:50 +0000 (11:57 +0000)]
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
am:
7aa7ee7338
Change-Id: I9e54ff0a37fc111c993d9db073f3fe7fbf0f5488
Charles He [Thu, 29 Dec 2016 11:56:00 +0000 (11:56 +0000)]
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
am:
140ac4efb5
Change-Id: I25deb2a809f93e6c556f5219facc957254dd1488
Charles He [Thu, 29 Dec 2016 11:55:48 +0000 (11:55 +0000)]
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
am:
cc2c82436e
Change-Id: I9c3ea23206e3d42fe32f3b5091093b51431d4611
Charles He [Thu, 29 Dec 2016 11:53:47 +0000 (11:53 +0000)]
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
am:
2518cfcc59
Change-Id: Ic1496b88e823f14497f21bf86ff16543cb201440
Charles He [Thu, 29 Dec 2016 11:53:36 +0000 (11:53 +0000)]
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
am:
ac437a2961
Change-Id: I5136cccc00c7c38781da51eee549c74be01efef3
Charles He [Thu, 29 Dec 2016 11:51:43 +0000 (11:51 +0000)]
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
am:
bf9a3b4b0d
Change-Id: I0dd2ac558534b27371690c7b5f703ec27effeb93
Charles He [Thu, 29 Dec 2016 11:51:30 +0000 (11:51 +0000)]
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
am:
f2263e3a5e
Change-Id: I7dc971d31d61d49bbe2c2031ef336176cc9b3eae
Charles He [Thu, 29 Dec 2016 11:49:33 +0000 (11:49 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:49:21 +0000 (11:49 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:43:45 +0000 (11:43 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:43:34 +0000 (11:43 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:38:41 +0000 (11:38 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:38:32 +0000 (11:38 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:37:01 +0000 (11:37 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:28:46 +0000 (11:28 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:28:20 +0000 (11:28 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:28:03 +0000 (11:28 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:27:37 +0000 (11:27 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:27:34 +0000 (11:27 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:27:06 +0000 (11:27 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:26:50 +0000 (11:26 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:26:23 +0000 (11:26 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:26:18 +0000 (11:26 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:25:55 +0000 (11:25 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:25:28 +0000 (11:25 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:25:11 +0000 (11:25 +0000)]
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
Android Build Merger (Role) [Thu, 29 Dec 2016 11:24:59 +0000 (11:24 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:24:10 +0000 (11:24 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:23:57 +0000 (11:23 +0000)]
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
Ivan Podogov [Thu, 29 Dec 2016 11:23:55 +0000 (11:23 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:20:39 +0000 (11:20 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:20:16 +0000 (11:20 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:19:27 +0000 (11:19 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:19:07 +0000 (11:19 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:18:16 +0000 (11:18 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:18:04 +0000 (11:18 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:17:05 +0000 (11:17 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +0000)]
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
Ivan Podogov [Thu, 29 Dec 2016 11:16:50 +0000 (11:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours am:
fd770e1cb8
am:
b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
Ivan Podogov [Thu, 29 Dec 2016 11:10:29 +0000 (11:10 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." am:
895e2d7a40 -s ours
am:
fd770e1cb8
Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
Charles He [Thu, 29 Dec 2016 11:06:56 +0000 (11:06 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:05:43 +0000 (11:05 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:04:37 +0000 (11:04 +0000)]
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
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +0000)]
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
Ivan Podogov [Thu, 29 Dec 2016 11:03:21 +0000 (11:03 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
am:
895e2d7a40 -s ours
Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
Charles He [Thu, 29 Dec 2016 10:58:44 +0000 (10:58 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:57:41 +0000 (10:57 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:44:41 +0000 (10:44 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:43:40 +0000 (10:43 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c
am:
3cc7f6acdc
Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:37:45 +0000 (10:37 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:36:32 +0000 (10:36 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089
am:
ced5ab190c
Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c
Charles He [Thu, 29 Dec 2016 10:35:19 +0000 (10:35 +0000)]
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
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9
am:
9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
Charles He [Thu, 29 Dec 2016 10:28:57 +0000 (10:28 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b
am:
5c74a1e9bb
Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7
Charles He [Thu, 29 Dec 2016 10:27:52 +0000 (10:27 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8
am:
0cc0219089
Change-Id: Id72d64d9356e362f35062bc6e45071b2be308558
Charles He [Thu, 29 Dec 2016 10:26:51 +0000 (10:26 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd
am:
e15e0de7e5
Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882
am:
e5156ec1e9
Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
Charles He [Thu, 29 Dec 2016 10:21:47 +0000 (10:21 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad
am:
f027831c6b
Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22
Charles He [Thu, 29 Dec 2016 10:20:47 +0000 (10:20 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2
am:
76ca2da7e8
Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
Charles He [Thu, 29 Dec 2016 10:19:49 +0000 (10:19 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7
am:
b64af9bacd
Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611
am:
00a581f882
Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
Ivan Podogov [Thu, 29 Dec 2016 10:18:10 +0000 (10:18 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT."
Charles He [Thu, 29 Dec 2016 10:14:26 +0000 (10:14 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d
am:
a1d59972ad
Change-Id: I027ab6594b563204515677fca9c256251b7067cd
Charles He [Thu, 29 Dec 2016 10:13:27 +0000 (10:13 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f
am:
6aa436bef2
Change-Id: I994b2fe070091a32beffff9dbf11b907b7878fe8
Charles He [Thu, 29 Dec 2016 10:12:24 +0000 (10:12 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92
am:
d7f2a4b0c7
Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b
Charles He [Thu, 29 Dec 2016 10:11:20 +0000 (10:11 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d
am:
133ff4d611
Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
Charles He [Thu, 29 Dec 2016 10:07:20 +0000 (10:07 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b
am:
1422a6074d
Change-Id: I2f3bf02f57c5f00964e645321467977b4ef498a7
Charles He [Thu, 29 Dec 2016 10:06:14 +0000 (10:06 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9
am:
d0339c6e8f
Change-Id: I0dbec3edf704821eb4605a48b770461eb99ddae7
Charles He [Thu, 29 Dec 2016 10:05:02 +0000 (10:05 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888
am:
a8484b4f92
Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06
Charles He [Thu, 29 Dec 2016 10:03:53 +0000 (10:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca
am:
2ce5c4320d
Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
Charles He [Thu, 29 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
am:
63a27d773b
Change-Id: I01d332678c1c3fe57ed36062a9ed01b5f368a55d
Charles He [Thu, 29 Dec 2016 09:50:20 +0000 (09:50 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am:
71d2a41dd9
Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
Charles He [Thu, 29 Dec 2016 09:48:50 +0000 (09:48 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
am:
4bd97eb888
Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am:
a9437bd1ca
Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
Charles He [Thu, 29 Dec 2016 09:43:10 +0000 (09:43 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
Charles He [Thu, 29 Dec 2016 09:42:25 +0000 (09:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
Martijn Coenen [Thu, 29 Dec 2016 09:27:24 +0000 (09:27 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166 am:
010d0be575 am:
1f8c96ca7f
am:
c052e6c67f
Change-Id: I5b515db7eaeac33a9072e6046f4c5bb948d5aa39
Martijn Coenen [Thu, 29 Dec 2016 09:19:55 +0000 (09:19 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166 am:
010d0be575
am:
1f8c96ca7f
Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
Martijn Coenen [Thu, 29 Dec 2016 09:12:22 +0000 (09:12 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166
am:
010d0be575
Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
Martijn Coenen [Thu, 29 Dec 2016 09:04:49 +0000 (09:04 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
am:
7705363166
Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
Martijn Coenen [Thu, 29 Dec 2016 08:07:44 +0000 (08:07 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
Martijn Coenen [Tue, 27 Dec 2016 13:33:09 +0000 (14:33 +0100)]
Add (un)linkToDeath support to HwBinder.
This is mostly copied over from binder's existing
death recipient support. The implementation keeps
a list of registered recipients, both for being
able to map a native recipient back to the corresponding
Java recipient, as well as being able to unregister
recipients correctly.
Test: mma, hidl_test_java
Bug:
31632518
Change-Id: Id313fd248be6925056c4ade8298fe5fb04e007cc
ashutoshj [Thu, 29 Dec 2016 02:00:03 +0000 (02:00 +0000)]
Merge "Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910" into nyc-mr2-dev-plus-aosp
am:
ef5d594abb -s ours
Change-Id: Ib00d39fe1102bbe95171620420dc1016f02502dc
ashutoshj [Thu, 29 Dec 2016 01:59:48 +0000 (01:59 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910
am:
3659363d06 -s ours
Change-Id: I40d4f12980f2068e1ad81d1c69ef0bb0489dcc80
Jiaquan He [Thu, 29 Dec 2016 01:58:26 +0000 (01:58 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev am:
c87fcb0963
am:
b0ff5e511a
Change-Id: Ieb4f9a723215946835c0a9448c8cac464a6ffc0c
Jiaquan He [Thu, 29 Dec 2016 01:57:24 +0000 (01:57 +0000)]
Move grid checking into the layout algorithm. am:
26f637b555
am:
c29cd0fdca
Change-Id: Icf69a78743697daaad7e55ca6116d24f716c88ef
Android Build Merger (Role) [Thu, 29 Dec 2016 01:53:33 +0000 (01:53 +0000)]
Merge "Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738 am:
cf33fd7910" into nyc-mr2-dev-plus-aosp
ashutoshj [Thu, 29 Dec 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c am:
8a3f7c0738
am:
cf33fd7910
Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
Jiaquan He [Thu, 29 Dec 2016 01:51:30 +0000 (01:51 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
am:
c87fcb0963
Change-Id: I5f2a91b5f52f2dd3ebc564c127a1f939a4bc20a4
Jiaquan He [Thu, 29 Dec 2016 01:51:24 +0000 (01:51 +0000)]
Move grid checking into the layout algorithm.
am:
26f637b555
Change-Id: Ie65d71bd7f6edb5e92f6dd331999424a592c8073
ashutoshj [Thu, 29 Dec 2016 01:45:34 +0000 (01:45 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c
am:
8a3f7c0738
Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
OSDN Git Service
