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

207016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius D'souza
d5bf4039a9 DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support 
am: 3275a3a5a5  -s ours

Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
 2016-08-23 16:45:41 +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
364a51221a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 
am: ddf70b9195

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
 2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
 2016-08-19 20:16:34 +00:00
Jim Miller
ddf70b9195 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 
am: 02e9affa42

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
 2016-08-19 20:09:43 +00: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
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
Sudheer Shanka
58def3804c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 
am: 08eb52f9f9

Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
 2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
 2016-08-19 17:54:19 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb 
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
 2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
 2016-08-19 17:32:44 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
 2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch 
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
 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
cb83f6188b Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c 
am: 229de7088e

Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
 2016-08-17 23:15:43 +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
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
0903c5fe7a DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. 
am: 13edf0a70b  -s ours

Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
 2016-08-15 19:25: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
Chris Tate
1d64d33ba8 Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c623c 
am: a8e21860af

Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
 2016-08-10 17:44:52 +00:00
Christopher Tate
6ea7b630c2 DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 
am: aac7d0442c

Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
 2016-08-10 17:44:50 +00:00
Chris Tate
a8e21860af Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev 
am: 72933c623c

Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
 2016-08-10 17:28:30 +00: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
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
1353c06d83 DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable 
am: 61038ddb61  -s ours

Change-Id: Id9a09514011ddf7c15106e22e06d24079e3cdb31
 2016-08-03 23:01:50 +00: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
Sungsoo Lim
2f7756f4c9 Merge \\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa am: ee0c3b013a 
am: 0d05028ba8

Change-Id: Ia66f61ac4d53b2908b6a468375346c21c61c2d5a
 2016-07-30 08:11:04 +00:00
Sungsoo Lim
0d05028ba8 Merge \\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa 
am: ee0c3b013a

Change-Id: Ic5f0abe33b51bd085a990c1d48d5c7c9eb5af8fe
 2016-07-30 07:42:35 +00:00
Sungsoo Lim
cf94d53469 DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 am: c3485668ad 
am: 174f17bc19

Change-Id: Id47b0c1771b9fb85b874b9d7b8892d31506a842b
 2016-07-30 07:23:37 +00:00
Sungsoo Lim
ee0c3b013a Merge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours 
am: cc154342aa

Change-Id: Ic1bc071d11c42771d46ad1b2da9e9264299d5e7b
 2016-07-30 07:14:33 +00:00
Sungsoo Lim
174f17bc19 DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 
am: c3485668ad

Change-Id: Ieaf58a651f3bd15ee49d81fea3f118331e908cd7
 2016-07-30 07:13:57 +00:00
Sungsoo Lim
c3485668ad DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours 
am: 1559998d08

Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c
 2016-07-30 06:55:41 +00:00
Sudheer Shanka
247edeb721 Merge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd 
am: 9457779aa4

Change-Id: Ib123df6f044bb7a5323235a4aafe69b04865acfa
 2016-07-30 06:43:27 +00:00
Sudheer Shanka
5b420a7b44 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 am: c2178ed1d9 
am: 32f4f1a697

Change-Id: I89358f925d063a311f208c92ae7b34f9dcffad8b
 2016-07-30 06:43:25 +00:00
Sungsoo Lim
cc154342aa Merge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 
am: ec986ac944  -s ours

Change-Id: I66ddeab0f0f2fa3d3f3fff71a20cd0b842c2f9d6
 2016-07-30 06:41:37 +00:00
Sungsoo Lim
1559998d08 DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c 
am: 1fcc472b3e  -s ours

Change-Id: Icf6055101947c23621ed320469c475dd105dd60f
 2016-07-30 06:41:33 +00:00
Sudheer Shanka
9a7c067034 Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into mnc-dev am: e140322bde am: 088e081ac1 
am: 72f9d1ff97

Change-Id: I71b12632934b7ac1284929e276a6a462509ab969
 2016-07-30 06:31:19 +00:00
Sudheer Shanka
77f0b54c0b DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5 
am: 7559673a6d

Change-Id: I874a78978c631ed3060fcac1547b261537045d8c
 2016-07-30 06:31:16 +00:00
Sudheer Shanka
9457779aa4 Merge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e 
am: 382f9aadcd

Change-Id: I8a40d4f562110009f0e155c370e09daea6cafe79
 2016-07-30 06:30:14 +00:00
Sudheer Shanka
32f4f1a697 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 
am: c2178ed1d9

Change-Id: Ibcbf12ee9bb11c76c46a3d0db5aad81e8462a9f6
 2016-07-30 06:30:10 +00:00
Sudheer Shanka
382f9aadcd Merge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours 
am: 98ae56902e

Change-Id: I5fb6decba8be97f68a0b24d6caa5d718929ea4d3
 2016-07-30 06:21:06 +00:00
Sudheer Shanka
c2178ed1d9 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours 
am: 373492b076

Change-Id: Ibfc86e4b13fcc88c09b7ac74a7b0ddc4bd42dda7
 2016-07-30 06:21:04 +00:00
Sudheer Shanka
72f9d1ff97 Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into mnc-dev am: e140322bde 
am: 088e081ac1

Change-Id: Ia0621eda31e392aa381f401bf05782201a4037a0
 2016-07-30 06:19:25 +00:00
Sudheer Shanka
7559673a6d DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 
am: 2349d0dea5

Change-Id: Id099c53df0a4a7c6996e546dfe6017b375f6d34e
 2016-07-30 06:19:20 +00:00
Sungsoo Lim
ec986ac944 Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 
am: 8ef8e2b648

Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
 2016-07-30 05:57:16 +00:00
Sungsoo Lim
1fcc472b3e DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 
am: f928b8062c

Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
 2016-07-30 05:57:09 +00:00