David Christie
362668b6f7
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
...
am: e24eb2dbb5
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5
resolve merge conflicts of a2399b4 to mnc-dev
...
am: 6195acc2b5
2016-08-24 22:16:07 +00:00
David Christie
6195acc2b5
resolve merge conflicts of a2399b4 to mnc-dev
...
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
David Christie
a2399b45e2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
2016-08-23 16:19:51 -07: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
2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
2016-08-19 20:03:48 +00:00
Amith Yamasani
39c7879365
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4
...
am: 29ae7b1a27
2016-08-19 17:32:44 +00:00
Amith Yamasani
29ae7b1a27
DO NOT MERGE: Clean up when recycling a pid with a pending launch
...
am: d1eeb5b7b4
2016-08-19 17:22:25 +00:00
Sudheer Shanka
b51e98becb
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
2016-08-19 17:06:55 +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
Jim Miller
229de7088e
Fix vulnerability in LockSettings service am: 2d71384a13
...
am: 485fbda04c
2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c
Fix vulnerability in LockSettings service
...
am: 2d71384a13
2016-08-17 22:59:27 +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
Amith Yamasani
d1eeb5b7b4
DO NOT MERGE: Clean up when recycling a pid with a pending launch
...
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug: 30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
2016-08-12 18:16:38 -07:00
David Christie
1081a15fd4
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2
...
am: b7f8b59e24
2016-08-12 20:17:00 +00:00
David Christie
b7f8b59e24
resolve merge conflicts of b4a5615 to lmp-dev
...
am: 288166cbb2
2016-08-12 20:09:54 +00:00
David Christie
288166cbb2
resolve merge conflicts of b4a5615 to lmp-dev
...
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
2016-08-11 13:06:08 -07:00
David Christie
b4a5615416
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923
...
am: 3462e52676
2016-08-11 18:33:15 +00:00
Christopher Tate
aac7d0442c
DO NOT MERGE: Backport N backup/restore stability work to M
...
am: d6f3a11107
2016-08-10 17:28:28 +00:00
Chris Tate
72933c623c
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
2016-08-10 17:15: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
7559673a6d
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962
...
am: 2349d0dea5
2016-07-30 06:19:20 +00:00
Sudheer Shanka
2349d0dea5
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
...
am: 8a8d7e7962
2016-07-30 05:26:51 +00:00
Sudheer Shanka
f01ee1c291
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e
...
am: 9f6bd40108
2016-07-30 05:08:35 +00:00
Sudheer Shanka
9f6bd40108
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
...
am: 7ef684713e
2016-07-30 04:54:25 +00:00
Sudheer Shanka
8a8d7e7962
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
...
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
2016-07-29 10:55:06 -07:00
Sudheer Shanka
7ef684713e
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
...
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
2016-07-29 10:51:02 -07:00
David Christie
dde12c6923
Fix vulnerability where large GPS XTRA data can be injected.
...
-Can potentially crash system with OOM.
Bug: 29555864
Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4
2016-07-25 17:13:23 -07:00
Benjamin Franz
87534f4ac9
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
...
am: 7abd7ba093
2016-07-21 10:10:03 +00:00
Benjamin Franz
7abd7ba093
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
...
am: 3e582390b3
2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
2016-07-21 09:59:42 +00:00
Julia Reynolds
5c6db3af89
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am: 234e1c25e4
...
am: 8e8bb6633c
2016-07-15 14:12:23 +00:00
Julia Reynolds
8e8bb6633c
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
...
am: 234e1c25e4
2016-07-15 14:06:49 +00:00
Benjamin Franz
7fbb93d4aa
DO NOT MERGE Block the user from entering safe boot mode
...
Block the user from entering safe boot mode if the DISALLOW_SAFE_BOOT
policy is set.
Bug: 26251884
Change-Id: I4945d5d676928346c11ea305a5b6a2e1a42e94e6
2016-07-14 17:28:55 +00:00
Sudheer Shanka
fd0757f195
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f
...
am: 177422c91e
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
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
Julia Reynolds
f4811159f3
Check caller's uid before allowing notification policy access.
...
Bug: 29421441
Change-Id: I7460268595e932d54660b02007bcd68b95fe8aec
2016-07-11 05:13:08 +00:00
Julia Reynolds
2a44859c21
Merge \"Always apply config updates.\" into mnc-dr-dev
...
am: f437bd068c
2016-07-01 15:26:58 +00:00
Julia Reynolds
81a560a90d
Always apply config updates.
...
In case the config and global settings are mismatched.
Bug: 29617474
Change-Id: I3a3ae338dce45c7c7e579d56f6d05b581e0dd8f7
2016-06-28 14:08:17 -04:00
Sudheer Shanka
fb87ae59b0
Merge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
...
am: 9bfa0ad22f
2016-06-21 22:19:05 +00:00
Sudheer Shanka
9bfa0ad22f
Merge \"Reduce shell power over user management.\" into mnc-dev
...
am: 964500fd43
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
Hall Liu
317d0cb169
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
...
am: aeba34533c
2016-06-20 21:21:25 +00:00
