OSDN Git Service
fionaxu [Thu, 7 Jul 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993
am:
50904bedb5
Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
fionaxu [Thu, 7 Jul 2016 01:39:09 +0000 (01:39 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa
am:
f6923d2993
Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
fionaxu [Thu, 7 Jul 2016 01:32:07 +0000 (01:32 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours
am:
d061c3abfa
Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472
am:
b4849f8d74 -s ours
Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Wed, 6 Jul 2016 23:36:00 +0000 (23:36 +0000)]
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893
am:
69a071e55c
Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
Chen Xu [Wed, 6 Jul 2016 23:29:51 +0000 (23:29 +0000)]
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am:
d2e2288fe3
am:
59fc768893
Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
fionaxu [Wed, 6 Jul 2016 23:24:04 +0000 (23:24 +0000)]
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am:
d2e2288fe3
Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
fionaxu [Fri, 1 Jul 2016 22:55:45 +0000 (22:55 +0000)]
Merge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999 am:
0828455ca9 am:
caabaab8bc -s ours am:
67f8e822ac am:
f82ca1f3e9
am:
0f741391c3
Change-Id: I9748b9d7b065a6d2bbd9c2a3061409c58b53d261
Chen Xu [Fri, 1 Jul 2016 22:45:46 +0000 (22:45 +0000)]
Merge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999 am:
0828455ca9 am:
caabaab8bc -s ours am:
67f8e822ac
am:
f82ca1f3e9
Change-Id: Ib714c74aa3bede2bea496204b7d1cb7ff2380dca
fionaxu [Fri, 1 Jul 2016 22:38:28 +0000 (22:38 +0000)]
Merge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999 am:
0828455ca9 am:
caabaab8bc -s ours
am:
67f8e822ac
Change-Id: I54214d329e81a59e418cc9f4a5ff150b6348a8c2
Chen Xu [Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)]
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999 am:
0828455ca9
am:
caabaab8bc -s ours
Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44
fionaxu [Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)]
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999
am:
0828455ca9
Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961
Chen Xu [Fri, 1 Jul 2016 22:09:39 +0000 (22:09 +0000)]
Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am:
521efcd1e3 -s ours
am:
7bd0eea999
Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a
fionaxu [Fri, 1 Jul 2016 21:59:03 +0000 (21:59 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am:
521efcd1e3 -s ours
Change-Id: I278455eb32488b221de93acd52b64956149cad54
Chen Xu [Fri, 1 Jul 2016 21:44:05 +0000 (21:44 +0000)]
Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev
Julia Reynolds [Fri, 1 Jul 2016 15:31:52 +0000 (15:31 +0000)]
Merge \\"Always apply config updates.\\" into mnc-dr-dev am:
f437bd068c
am:
2a44859c21
Change-Id: I1462c5cc78001f6be749f518c861c7fcc771f90f
Julia Reynolds [Fri, 1 Jul 2016 15:26:58 +0000 (15:26 +0000)]
Merge \"Always apply config updates.\" into mnc-dr-dev
am:
f437bd068c
Change-Id: I899b923c075a5f3351c4791a23a94adf123d1247
Julia Reynolds [Fri, 1 Jul 2016 15:21:23 +0000 (15:21 +0000)]
Merge "Always apply config updates." into mnc-dr-dev
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Thu, 30 Jun 2016 23:26:56 +0000 (23:26 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c
am:
b281795c12
Change-Id: I666bfd00c747b43ef07f90b8ef61b8fe79470312
fionaxu [Thu, 30 Jun 2016 23:19:16 +0000 (23:19 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3
am:
0b2c2b2a8c
Change-Id: I49b57d13076a736f674434403ac2470680fe398a
fionaxu [Thu, 30 Jun 2016 23:11:22 +0000 (23:11 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours
am:
c7824b3de3
Change-Id: I89dc27d498872a0e4ce539b293f3ffa9f74e38e9
fionaxu [Thu, 30 Jun 2016 23:06:21 +0000 (23:06 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33
am:
1e1974705b -s ours
Change-Id: Idbdf23dc9c74330080cf55a048d92b0dddafb99e
fionaxu [Thu, 30 Jun 2016 22:57:27 +0000 (22:57 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4
am:
c666ebef33
Change-Id: I8b40b7fbf1c6b2e9fa556c6fc31d81b98e291fdf
fionaxu [Thu, 30 Jun 2016 22:51:55 +0000 (22:51 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours
am:
cbb7b8c7a4
Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd
fionaxu [Thu, 30 Jun 2016 22:43:10 +0000 (22:43 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours
am:
f52501d2d4 -s ours
Change-Id: Ibc5076680df923f5edf2a09e4331b75604bd863f
fionaxu [Thu, 30 Jun 2016 22:37:24 +0000 (22:37 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909
am:
a3b851d352 -s ours
Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3
fionaxu [Thu, 30 Jun 2016 22:31:52 +0000 (22:31 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2
am:
a0263a9909
Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
fionaxu [Thu, 30 Jun 2016 22:25:47 +0000 (22:25 +0000)]
DO NOT MERGE revert public api loadSafeLabel
am:
f44c73abb2
Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
Julia Reynolds [Tue, 28 Jun 2016 14:01:28 +0000 (10:01 -0400)]
Always apply config updates.
In case the config and global settings are mismatched.
Bug:
29617474
Change-Id: I3a3ae338dce45c7c7e579d56f6d05b581e0dd8f7
fionaxu [Tue, 28 Jun 2016 07:43:35 +0000 (00:43 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
fionaxu [Tue, 28 Jun 2016 05:52:56 +0000 (22:52 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
Sudheer Shanka [Tue, 21 Jun 2016 23:14:52 +0000 (23:14 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours am:
e01775f0be am:
5e41f90a92
am:
80e720742b
Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2
Sudheer Shanka [Tue, 21 Jun 2016 23:10:54 +0000 (23:10 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours am:
e01775f0be
am:
5e41f90a92
Change-Id: I5b9897a2a3e44faed6f101c52ab729612404c739
Sudheer Shanka [Tue, 21 Jun 2016 23:05:02 +0000 (23:05 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours am:
199f6a490a am:
06c3f60136
am:
9088be4ebe
Change-Id: I886553aec1438d0857cdc52413008ecaf64bae2a
Sudheer Shanka [Tue, 21 Jun 2016 22:55:40 +0000 (22:55 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours am:
199f6a490a
am:
06c3f60136
Change-Id: Ie7b8e901e3fbb46f3d7d76b1bc8ea8bc6c31eb63
Sudheer Shanka [Tue, 21 Jun 2016 22:42:25 +0000 (22:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours
am:
e01775f0be
Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a
Sudheer Shanka [Tue, 21 Jun 2016 22:42:23 +0000 (22:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours
am:
199f6a490a
Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94
Sudheer Shanka [Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d
am:
47da8a0bdc -s ours
Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
Sudheer Shanka [Tue, 21 Jun 2016 22:36:43 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae
am:
0d457d1254 -s ours
Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78
Sudheer Shanka [Tue, 21 Jun 2016 22:31:11 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41
am:
a9b937b29d
Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b
Sudheer Shanka [Tue, 21 Jun 2016 22:31:09 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0
am:
e0cc5e20ae
Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
Sudheer Shanka [Tue, 21 Jun 2016 22:25:34 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am:
b43fe62933 -s ours
am:
96676a2d41
Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837
am:
916728bb35
Change-Id: Id7990003b3a5a6db9f9d16eb57ec37d47505165a
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am:
e64034a27d -s ours
am:
db7e70c2f0
Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
Sudheer Shanka [Tue, 21 Jun 2016 22:25:19 +0000 (22:25 +0000)]
Merge \\\"Reduce shell power over user management.\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f
am:
fb87ae59b0
Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7
Sudheer Shanka [Tue, 21 Jun 2016 22:19:09 +0000 (22:19 +0000)]
Merge \\"Add pm operation to set user restrictions.\\" into mnc-dev am:
144b3a42cc
am:
f43aa2e837
Change-Id: Ic6c3cf2871105e5f81bbd30ee30311b5d5a535a6
Sudheer Shanka [Tue, 21 Jun 2016 22:19:05 +0000 (22:19 +0000)]
Merge \\"Reduce shell power over user management.\\" into mnc-dev am:
964500fd43
am:
9bfa0ad22f
Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
Sudheer Shanka [Tue, 21 Jun 2016 22:12:17 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am:
b43fe62933 -s ours
Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
Sudheer Shanka [Tue, 21 Jun 2016 22:12:15 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am:
e64034a27d -s ours
Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
Sudheer Shanka [Tue, 21 Jun 2016 22:11:47 +0000 (22:11 +0000)]
Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am:
144b3a42cc
Change-Id: I1de4650ef53751654145a3ad1c40390711414341
Sudheer Shanka [Tue, 21 Jun 2016 22:11:44 +0000 (22:11 +0000)]
Merge \"Reduce shell power over user management.\" into mnc-dev
am:
964500fd43
Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
Sudheer Shanka [Tue, 21 Jun 2016 22:03:14 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:08 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Hall Liu [Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)]
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c
am:
317d0cb169
Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am:
fc32ec1aef
am:
aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am:
fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Christopher Tate [Fri, 17 Jun 2016 00:34:47 +0000 (00:34 +0000)]
DO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519
am:
1a450675f3
Change-Id: I5fef884dbf640b60c1bf4c28a6d95abb4d42061b
Christopher Tate [Fri, 17 Jun 2016 00:31:08 +0000 (00:31 +0000)]
DO NOT MERGE: Don\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a
am:
34fb87b519
Change-Id: If7444547d0bd82f43bb05439977e536a01589b3c
Christopher Tate [Fri, 17 Jun 2016 00:24:29 +0000 (00:24 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab
am:
e2c9b1af3e
Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
Christopher Tate [Fri, 17 Jun 2016 00:22:07 +0000 (00:22 +0000)]
DO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours
am:
c61f35ed9a
Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e
Christopher Tate [Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386
am:
d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +0000)]
DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453
am:
2149ebeadf -s ours
Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
Christopher Tate [Fri, 17 Jun 2016 00:15:07 +0000 (00:15 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev
am:
3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of
cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
Christopher Tate [Thu, 16 Jun 2016 22:53:29 +0000 (22:53 +0000)]
DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140
am:
918fb5d453
Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e
Christopher Tate [Thu, 16 Jun 2016 22:50:23 +0000 (22:50 +0000)]
DO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours
am:
b1e31ad140
Change-Id: I3668160c863e8fe34ca6d233d63113069fec8e5a
Christopher Tate [Thu, 16 Jun 2016 22:45:45 +0000 (22:45 +0000)]
DO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours
am:
41821a26a5 -s ours
Change-Id: I028d0714c52079b71645197ac70a321285928fec
Christopher Tate [Thu, 16 Jun 2016 22:39:05 +0000 (22:39 +0000)]
DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2
am:
6633a4fee4 -s ours
Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
Christopher Tate [Thu, 16 Jun 2016 22:30:17 +0000 (22:30 +0000)]
Don\\\'t trust callers to supply app info to bindBackupAgent() am:
c58054f25f am:
cd777e95a7
am:
ec6c3f7a32
Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
Christopher Tate [Thu, 16 Jun 2016 22:27:18 +0000 (22:27 +0000)]
DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283
am:
f615799ef2
Change-Id: Ibc84666aa491986fe861b82400affde1675e632d
Christopher Tate [Thu, 16 Jun 2016 22:27:04 +0000 (22:27 +0000)]
Don\\'t trust callers to supply app info to bindBackupAgent() am:
c58054f25f
am:
cd777e95a7
Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
Christopher Tate [Thu, 16 Jun 2016 22:21:37 +0000 (22:21 +0000)]
Don\'t trust callers to supply app info to bindBackupAgent()
am:
c58054f25f
Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
Christopher Tate [Thu, 16 Jun 2016 22:21:25 +0000 (22:21 +0000)]
DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
am:
d85a4ed283
Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Kevin Gabayan [Wed, 15 Jun 2016 20:40:34 +0000 (20:40 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136
am:
db843c913f
Change-Id: I1d2af755dd1a06fc2fef464b6ad5bc5e26f11ff6
Christopher Tate [Mon, 13 Jun 2016 22:17:54 +0000 (15:17 -0700)]
Don't trust callers to supply app info to bindBackupAgent()
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug
28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
Christopher Tate [Sat, 11 Jun 2016 00:59:44 +0000 (17:59 -0700)]
DO NOT MERGE: Don't trust callers to supply app info to bindBackupAgent()
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug
28795098
Change-Id: I62710b15bb601fdfedd68e32349168c10725eb45
Kevin Gabayan [Thu, 9 Jun 2016 22:40:50 +0000 (15:40 -0700)]
Compute AnyMotionDetector angle using atan2.
Bug:
29232136
Change-Id: Ie57d0228eb42246c4ac1d7a01e2782a621b7e78f
(cherry picked from commit
b070577d35436ca0f5463e6ed19a28ae431cfbfb)
Erik Wolsheimer [Thu, 9 Jun 2016 03:37:02 +0000 (03:37 +0000)]
Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am:
eae242cfe8 -s ours
Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
fionaxu [Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956 am:
dc9a7c7b23
am:
e892848035
Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed
fionaxu [Wed, 8 Jun 2016 18:33:22 +0000 (18:33 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956
am:
dc9a7c7b23
Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455
fionaxu [Wed, 8 Jun 2016 18:24:16 +0000 (18:24 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717 am:
c95d552de0
am:
c10e4fae05
Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee
fionaxu [Wed, 8 Jun 2016 18:22:46 +0000 (18:22 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours
am:
2d03c0f956
Change-Id: I9dfe9f73a3762ec0eed0659a7ac04f9980e715bb
fionaxu [Wed, 8 Jun 2016 18:11:09 +0000 (18:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717
am:
c95d552de0
Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
fionaxu [Wed, 8 Jun 2016 17:23:33 +0000 (17:23 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7
am:
16dfcd7950 -s ours
Change-Id: Ia5003c773216218c4ed2961587fb30f4536d89a7
fionaxu [Wed, 8 Jun 2016 17:23:27 +0000 (17:23 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c
am:
698e044717
Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
fionaxu [Wed, 8 Jun 2016 17:15:39 +0000 (17:15 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e
am:
eb53629bf7
Change-Id: Ie99251c23087ebe648a3450aa2a9fe881cb3c1f8
fionaxu [Wed, 8 Jun 2016 17:11:49 +0000 (17:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e
am:
965084dd0c
Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8