Commit Graph

153836 Commits

Author SHA1 Message Date
Sungsoo Lim
9fffc56cb1 DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
2016-07-15 08:34:38 +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
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
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
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
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
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
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
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
647cb6a6d8 DO NOT MERGE : backport of backup transport whitelist
Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df79172 from N

Change-Id: I405b49daee8c576584575c3e46877cc97632d8c6
2016-05-23 15:37:57 -07:00
John Reck
bfa719f448 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
2016-05-19 22:21:46 +00:00
John Reck
5527fd1323 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
2016-05-19 22:16:42 +00:00
John Reck
1b1fcbaab5 DO NOT MERGE Cherry pick libpng usage fixes
am: 7c9f2b8aa2

* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
2016-05-19 19:26:24 +00:00
John Reck
7c9f2b8aa2 DO NOT MERGE Cherry pick libpng usage fixes
------------------------------------------

This is a combination of 2 commits.
The first commit's message is:

Forward compatibility fixes

Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8

-------------------------------------------

This is the 2nd commit message:

libpng usage tweaks

 Bug: 10447005

 Call png_set_interlace_handling explicitly instead of relying on
 implicit handling that logs warnings

 Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99

-------------------------------------------
BUG:23265085
2016-05-17 20:29:52 +00:00
Paul Jensen
08ec0e53b8 Don't pass URL path and username/password to PAC scripts
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.

Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00:00
Christopher Tate
76418899e6 Kill the real/isolated uid group, not the ApplicationInfo uid
This is a direct reimplementation in L of fixes applied to N in
these two commits:

8dc8d37c1d
e8741d23d2

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
2016-04-18 15:20:01 -07:00
Todd Kennedy
c2cc804407 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9
am: ca13384  -s ours

* commit 'ca133845ef815d7cc1f036b1355130a8a867a98c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I88811d2bce66e53998360909612003873e9407af
2016-04-11 22:12:19 +00:00
Todd Kennedy
ca133845ef DO NOT MERGE Fix intent filter priorities am: 60351d3
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778
2016-04-11 22:06:38 +00:00
Todd Kennedy
3dfc6d986f DO NOT MERGE Fix intent filter priorities
am: 60351d3

* commit '60351d3be29977dfe0b422de797a0429edf500b7':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
2016-04-11 22:00:27 +00:00
Todd Kennedy
60351d3be2 DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-07 16:40:18 -07:00
Todd Kennedy
d6174e7402 DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 10:20:41 -07:00
Samuel Tan
d385a6d95f [DO NOT MERGE] Disallow guest user from changing Wifi settings
Disallow existing and newly created guest users from
changing Wifi settings.

BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
      that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
      settings are disabled.

Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
2016-03-18 14:25:41 -07:00
Shreyas Basarge
eec587edf1 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05
am: 58048c1f17

* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
  NPE fix for SyncStorageEngine read authority
2016-02-20 01:01:10 +00:00
Shreyas Basarge
58048c1f17 NPE fix for SyncStorageEngine read authority am: a962d9eba7
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
  NPE fix for SyncStorageEngine read authority
2016-02-20 00:47:41 +00:00
Shreyas Basarge
339c4f2b05 NPE fix for SyncStorageEngine read authority
am: a962d9eba7

* commit 'a962d9eba7a8f741ed149964126fb08fe4fd7128':
  NPE fix for SyncStorageEngine read authority
2016-02-20 00:41:03 +00:00
Shreyas Basarge
a962d9eba7 NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.

Bug: 26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
2016-02-19 23:38:33 +00:00
Matthew Williams
0d3e46391a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0
am: 5fc753acaf  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:19:53 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698)
2016-01-21 14:15:11 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698)
2016-01-20 00:02:58 +00:00