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

202802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
df7bd91dfa Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 2016-08-11 18:15:30 +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
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
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
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
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
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
Sungsoo Lim
8ef8e2b648 Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am: 124cc534f8 -s ours 
am: 3d58e326d9

Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
 2016-07-30 05:40:55 +00:00
Sungsoo Lim
f928b8062c DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours 
am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
 2016-07-30 05:40:52 +00:00
Sudheer Shanka
088e081ac1 Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into mnc-dev 
am: e140322bde

Change-Id: Idc3caa0c20f5d069ad6166f69d858ce8f6c99302
 2016-07-30 05:26:52 +00:00
Sudheer Shanka
2349d0dea5 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
am: 8a8d7e7962

Change-Id: Id3a971b538618801f97abe0bd1d03d11d2b8118c
 2016-07-30 05:26:51 +00:00
Sudheer Shanka
98ae56902e 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

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

Change-Id: I9bf603d8e6315552d8d00036aa67dc96e9ba678a
 2016-07-30 05:18:59 +00:00
Sudheer Shanka
28acd0fae9 Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am: dbbdb6d089 
am: 9ed6bd83ff

Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
 2016-07-30 05:08:39 +00:00
Sudheer Shanka
f01ee1c291 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e 
am: 9f6bd40108

Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
 2016-07-30 05:08:35 +00:00
Sudheer Shanka
9ed6bd83ff Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev 
am: dbbdb6d089

Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
 2016-07-30 04:54:27 +00:00
Sudheer Shanka
9f6bd40108 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
am: 7ef684713e

Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
 2016-07-30 04:54:25 +00:00
Sungsoo Lim
3d58e326d9 Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev 
am: 124cc534f8  -s ours

Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
 2016-07-30 04:44:18 +00:00
Sungsoo Lim
0fb1075d95 DO NOT MERGE: Fix CTS regression 
am: edc9238514  -s ours

Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
 2016-07-30 04:44:16 +00:00
Sungsoo Lim
124cc534f8 Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev 2016-07-29 23:18:52 +00:00
Sudheer Shanka
e140322bde Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into mnc-dev 2016-07-29 21:50:38 +00:00
Sudheer Shanka
dbbdb6d089 Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev 2016-07-29 21:50:33 +00:00
Sungsoo Lim
59cb7ab7b8 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 
am: bfdf9592d0

Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e
 2016-07-29 19:52:34 +00:00
Sungsoo Lim
bfdf9592d0 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours 
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607
 2016-07-29 19:48:00 +00:00
Sungsoo Lim
e0316fc7a8 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e 
am: b8d3dd2472  -s ours

Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e
 2016-07-29 19:35:54 +00:00
Sungsoo Lim
dd2ec80035 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 
am: 25782fae9b

Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b
 2016-07-29 19:24:37 +00:00
Sungsoo Lim
b8d3dd2472 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a 
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09
 2016-07-29 19:14:02 +00:00
Sungsoo Lim
b6a3e8ce8e DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours 
am: 2dbb64594a

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
 2016-07-29 19:03:14 +00:00
Sungsoo Lim
25782fae9b DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours 
am: 0bbdc37b60

Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
 2016-07-29 19:02:55 +00:00
Sungsoo Lim
0bbdc37b60 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 
am: 2df9864b54  -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
 2016-07-29 18:56:25 +00:00
Sungsoo Lim
2dbb64594a DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours 
am: 6489d870d7  -s ours

Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
 2016-07-29 18:56:07 +00:00
Sungsoo Lim
b04c428935 DO NOT MERGE: Fix CTS regression am: 90be39c7bb 
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a
 2016-07-29 18:50:29 +00:00
Sungsoo Lim
2df9864b54 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
 2016-07-29 18:50:25 +00:00
Sungsoo Lim
6489d870d7 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 
am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
 2016-07-29 18:45:45 +00:00
Sungsoo Lim
14abf736c8 DO NOT MERGE: Fix CTS regression 
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
 2016-07-29 18:38:07 +00:00
Sungsoo Lim
f645010092 DO NOT MERGE: Fix CTS regression am: df17644db7 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
 2016-07-29 18:38:06 +00:00
Sungsoo Lim
db9f504522 DO NOT MERGE: Fix CTS regression 
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
 2016-07-29 18:32:49 +00:00