David Christie
187d841b75
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
...
am: 0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
2016-08-24 22:33:39 +00:00
David Christie
0777ad8253
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
...
am: d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
2016-08-24 22:23:49 +00:00
David Christie
d610363a48
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
...
am: af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
2016-08-24 22:14:28 +00:00
David Christie
af369f6e66
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30
...
am: 8788a2413c
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
2016-08-24 20:30:06 +00:00
Julius D'souza
3275a3a5a5
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
Bug: 18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-22 11:40:03 -07:00
Jim Miller
9f04985991
Bind fingerprint when we start authentication - DO NOT MERGE
...
am: b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
2016-08-19 20:09:41 +00:00
Jim Miller
b6f4b48df2
Bind fingerprint when we start authentication - DO NOT MERGE
...
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug 30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +00:00
Narayan Kamath
8788a2413c
Process: Fix communication with zygote. am: e29c6493c0
...
am: 1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
2016-08-18 09:58:45 +00:00
Narayan Kamath
1bd43c162f
Process: Fix communication with zygote.
...
am: e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
2016-08-18 09:53:12 +00:00
Jim Miller
229de7088e
Fix vulnerability in LockSettings service am: 2d71384a13
...
am: 485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c
Fix vulnerability in LockSettings service
...
am: 2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
2016-08-17 22:59:27 +00:00
Narayan Kamath
e29c6493c0
Process: Fix communication with zygote.
...
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug: 30143607
(cherry-picked from commit 448be0a622 )
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 16:17:29 +00:00
Jim Miller
2d71384a13
Fix vulnerability in LockSettings service
...
Fixes bug 30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
2016-08-16 00:09:33 +00:00
Julius D'souza
13edf0a70b
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
...
Add overlay setting with current default value.
Bug: 30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
2016-08-15 12:15:29 -07:00
Christopher Tate
aac7d0442c
DO NOT MERGE: Backport N backup/restore stability work to M
...
am: d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
2016-08-10 17:28:28 +00:00
Christopher Tate
d6f3a11107
DO NOT MERGE: Backport N backup/restore stability work to M
...
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug 29617908
Bug 29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
2016-08-08 10:48:26 -07:00
Prashant Malani
61038ddb61
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
...
Add an overlay setting, and keep the default to its existing value of
200.
Bug: 26552257
Change-Id: Ifd29d80e28e57c5cfc640d519a62144ab5e963fa
2016-08-03 15:28:13 -07:00
Sudheer Shanka
fd0757f195
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f
...
am: 177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
2016-07-12 19:20:34 +00:00
Sudheer Shanka
177422c91e
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
...
am: f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
2016-07-12 19:11:35 +00:00
Sudheer Shanka
f1d9152f9f
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
2016-07-12 19:03:14 +00:00
Sudheer Shanka
3f12e8e2bf
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-07-12 01:59:08 +00:00
fionaxu
b4849f8d74
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf
...
am: 92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
2016-07-07 01:13:47 +00:00
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
69a071e55c
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
...
am: 59fc768893
Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
2016-07-06 23:29:51 +00:00
fionaxu
59fc768893
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
...
am: d2e2288fe3
Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
2016-07-06 23:24:04 +00:00
fionaxu
99973d9852
DO NOT MERGE revert system api loadSafeLabel
...
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-06-30 17:57:46 -07:00
fionaxu
0fffbcb158
DO NOT MERGE revert public api loadSafeLabel
...
Bug: 28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
2016-06-28 00:43:35 -07:00
Sudheer Shanka
fb87ae59b0
Merge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
...
am: 9bfa0ad22f
Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
2016-06-21 22:19:05 +00:00
Sudheer Shanka
9bfa0ad22f
Merge \"Reduce shell power over user management.\" into mnc-dev
...
am: 964500fd43
Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
2016-06-21 22:11:44 +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
964500fd43
Merge "Reduce shell power over user management." into mnc-dev
2016-06-21 22:03:05 +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
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
2016-06-16 22:30:17 +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
Sudheer Shanka
cd50529e6f
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-16 10:17:02 -07: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
Erik Wolsheimer
eae242cfe8
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
2016-06-09 03:25:43 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
2016-06-08 18:11:09 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
2016-06-08 17:23:27 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
2016-06-08 17:04:09 +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
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