drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,672 Commits 1 Branch 0 Tags
Commit Graph

164672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fionaxu
92b8cbd472 DO NOT MERGE revert system api loadSafeLabel 
am: 863ac471cf

Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
 2016-07-07 01:07:43 +00:00
fionaxu
863ac471cf DO NOT MERGE revert system api loadSafeLabel 
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
 2016-07-06 17:05:32 -07:00
Chen Xu
0828455ca9 Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3 -s ours 
am: 7bd0eea999

Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a
 2016-07-01 22:09:39 +00:00
fionaxu
7bd0eea999 Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev 
am: 521efcd1e3  -s ours

Change-Id: I278455eb32488b221de93acd52b64956149cad54
 2016-07-01 21:59:03 +00:00
Chen Xu
521efcd1e3 Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev 2016-07-01 21:44:06 +00:00
fionaxu
c666ebef33 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours am: f52501d2d4 -s ours 
am: cbb7b8c7a4

Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd
 2016-06-30 22:51:55 +00:00
fionaxu
cbb7b8c7a4 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 am: a3b851d352 -s ours 
am: f52501d2d4  -s ours

Change-Id: Ibc5076680df923f5edf2a09e4331b75604bd863f
 2016-06-30 22:43:10 +00:00
fionaxu
f52501d2d4 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 am: a0263a9909 
am: a3b851d352  -s ours

Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3
 2016-06-30 22:37:24 +00:00
fionaxu
a3b851d352 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 
am: a0263a9909

Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
 2016-06-30 22:31:52 +00:00
fionaxu
a0263a9909 DO NOT MERGE revert public api loadSafeLabel 
am: f44c73abb2

Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
 2016-06-30 22:25:47 +00:00
Paul Stewart
1033c6fdbc Fix string equality comparison 
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
 2016-06-30 11:58:38 -07:00
Paul Stewart
cc00f4d646 WifiEnterpriseConfiguration: Do not print credentials in toString 
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
 2016-06-30 11:57:20 -07:00
fionaxu
0fffbcb158 DO NOT MERGE revert public api loadSafeLabel 
Bug: 28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
 2016-06-28 00:43:35 -07:00
fionaxu
f44c73abb2 DO NOT MERGE revert public api loadSafeLabel 
Bug: 28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
 2016-06-27 23:52:19 -07:00
Sudheer Shanka
a9b937b29d Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am: b43fe62933 -s ours 
am: 96676a2d41

Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
 2016-06-21 22:25:34 +00:00
Sudheer Shanka
e0cc5e20ae Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am: e64034a27d -s ours 
am: db7e70c2f0

Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
 2016-06-21 22:25:31 +00:00
Sudheer Shanka
96676a2d41 Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev 
am: b43fe62933  -s ours

Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
 2016-06-21 22:12:17 +00:00
Sudheer Shanka
db7e70c2f0 Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev 
am: e64034a27d  -s ours

Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
 2016-06-21 22:12:15 +00:00
Sudheer Shanka
b43fe62933 Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev 2016-06-21 22:03:16 +00:00
Sudheer Shanka
e64034a27d Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev 2016-06-21 22:03:09 +00:00
Sudheer Shanka
8cc7430667 DO NOT MERGE: Add pm operation to set user restrictions. 
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
 2016-06-21 21:43:51 +00:00
Sudheer Shanka
65f53e1445 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
 2016-06-21 18:45:13 +00:00
Christopher Tate
918fb5d453 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
 2016-06-16 22:50:23 +00:00
Christopher Tate
b1e31ad140 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
 2016-06-16 22:45:45 +00:00
Christopher Tate
41821a26a5 DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 
am: 6633a4fee4  -s ours

Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
 2016-06-16 22:39:05 +00:00
Christopher Tate
6633a4fee4 DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 
am: f615799ef2

Change-Id: Ibc84666aa491986fe861b82400affde1675e632d
 2016-06-16 22:27:18 +00:00
Christopher Tate
ec6c3f7a32 Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f 
am: cd777e95a7

Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
 2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7 Don\'t trust callers to supply app info to bindBackupAgent() 
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
 2016-06-16 22:21:37 +00:00
Christopher Tate
f615799ef2 DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent() 
am: d85a4ed283

Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899
 2016-06-16 22:21:25 +00:00
Christopher Tate
c58054f25f 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
 2016-06-14 13:28:43 -07:00
Christopher Tate
d85a4ed283 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
 2016-06-14 13:28:33 -07:00
fionaxu
eb53629bf7 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours 
am: 0e64d7411e

Change-Id: I856719a3bec69549b83507fefcd662ce54104eaf
 2016-06-08 17:10:02 +00:00
fionaxu
0e64d7411e DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours 
am: e1ca4cd074  -s ours

Change-Id: Icbb64c652c66c55fcc6e0cf1500af2cfb99fdbb3
 2016-06-08 16:58:26 +00:00
fionaxu
1e8fe12f4e resolve merge conflicts of 2c53526 to lmp-mr1-dev 
am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9
 2016-06-08 16:58:13 +00:00
fionaxu
c196526f8e resolve merge conflicts of 2c53526 to lmp-mr1-dev 
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
 2016-06-07 22:01:19 -07:00
fionaxu
e1ca4cd074 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c 
am: 84f479f6b5  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816
 2016-06-08 02:04:12 +00:00
fionaxu
84f479f6b5 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
 2016-06-08 01:59:04 +00:00
fionaxu
07c994012c DO NOT MERGE fix build breakage on k 
am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
 2016-06-08 01:49:39 +00:00
fionaxu
4e33c4f8b1 DO NOT MERGE fix build breakage on k 
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
 2016-06-07 17:55:27 -07:00
fionaxu
2c53526b4b Backport loadSafeLabel changes am: be2865a60a am: 4c50846519 
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8
 2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5 Backport loadSafeLabel changes am: be2865a60a 
am: 4c50846519

Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4
 2016-06-07 23:20:04 +00:00
fionaxu
4c50846519 Backport loadSafeLabel changes 
am: be2865a60a

Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
 2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a Backport loadSafeLabel changes 
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
 2016-06-07 22:51:28 +00:00
Paul Jensen
75095e6f02 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 
am: 42a5983364

* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
 2016-05-26 14:13:16 +00:00
Paul Jensen
42a5983364 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 
am: 6c35cf2434

* commit '6c35cf2434ca373196b16620455f8f234b63d594':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
 2016-05-26 14:01:19 +00:00
Paul Jensen
6c35cf2434 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff 
am: bb27626141

* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
 2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff 
am: 8940d2b0ff

* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
 2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev 
am: af0b4466ff

* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
 2016-05-26 13:30:59 +00:00
Paul Jensen
af0b4466ff Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev 2016-05-26 13:18:05 +00:00
Christopher Tate
4c559cdade DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours 
am: 077534b101

* commit '077534b1015762d445f505fc2f440beaa2ba974a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf
 2016-05-25 23:06:02 +00:00