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

256862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
466bb400bb Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev 
am: d427da8a24

Change-Id: I8a4f01466e4b93782478e94240f2c8f2d74972ad
 2016-11-22 17:59:02 +00:00
Zach Jang
fe3b0b2cc1 Revert "Catch KeyStoreException for setting profile lock" 
am: e61672ab08

Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98
 2016-11-22 17:58:58 +00:00
Zach Jang
d427da8a24 Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev 2016-11-22 17:51:59 +00:00
Zach Jang
e61672ab08 Revert "Catch KeyStoreException for setting profile lock" 
This reverts commit c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.

Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
 2016-11-22 17:47:18 +00:00
Nancy Zheng
f9154e923b Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev 2016-11-21 18:13:06 +00:00
Nancy Zheng
43f166dfb4 Fix createConfirmDeviceCredentialIntent for wear for CTS. 
Bug: 33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
 2016-11-18 18:15:09 -08:00
Michael Kwan
56c25af274 Fix default dialog background colour for watch devices. 
Bug: 33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
 2016-11-18 15:02:43 -08:00
Erik Wolsheimer
d841ee9c81 Merge "Enable swipe to dismiss for watch devices." into cw-f-dev 2016-11-18 19:17:56 +00:00
Scott Main
ec9f41356c Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 
am: 97be8864e5

Change-Id: I340207420e0811c74751a96dc30e929a411ea207
 2016-11-18 15:36:33 +00:00
Scott Main
97be8864e5 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb 
am: 192a8c4973

Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
 2016-11-18 15:30:06 +00:00
Scott Main
192a8c4973 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 
am: c8b11fb7cb

Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
 2016-11-18 15:24:18 +00:00
Scott Main
c8b11fb7cb Add cross-links between FINE and COARSE location permissions. bug: 25371600 
am: 3fef783359

Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
 2016-11-18 15:17:06 +00:00
Ricky Wai
3b546019dc Catch KeyStoreException for setting profile lock 
am: c8fa5ed8f2

Change-Id: I28777d9d80ba13df463e05b95dd2524633554c9d
 2016-11-18 01:38:04 +00:00
Ricky Wai
c8fa5ed8f2 Catch KeyStoreException for setting profile lock 
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.

Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
 2016-11-18 00:02:24 +00:00
Fei Wu
447fff8589 Merge "Update colorPrimary in watch" into cw-f-dev 2016-11-16 21:05:28 +00:00
Scott Main
3fef783359 Add cross-links between FINE and COARSE location permissions. 
bug: 25371600

Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit b18745616f9dd6b79202168b648edcef382ea967)
 2016-11-16 04:08:16 +00:00
Selim Cinek
6cc0b517ba Fixed a bug with the emergency affordance in multi user 
am: b8a7f78d24

Change-Id: I68fa35dbedb3740eff1c83d03c9c9b5080d3ea81
 2016-11-15 01:18:35 +00:00
Selim Cinek
b8a7f78d24 Fixed a bug with the emergency affordance in multi user 
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.

Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
 2016-11-14 23:00:24 +00:00
Narayan Kamath
d9a8ee7598 Zygote: Additional whitelists for runtime overlay / other static resources. 
Partially cherry picked from commit 1c15c635785c64a.

These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.

Bug: 32618130

Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit 25cd01cc69fcad34756b00e52a79c0c54178f2e6)
(cherry picked from commit 9087f331a85790d49d1095e1eaf0305b7863e0ba)
 2016-11-14 17:21:37 +00:00
Andriy Naborskyy
415ec85fdb Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours 
am: 0a2ac837d1  -s ours

Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d
 2016-11-14 14:00:26 +00:00
Andriy Naborskyy
bb1dfdc660 DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours 
am: e26d15582b  -s ours

Change-Id: I6e1c029f57f69785b9a7070ec6e8c35673b65cc2
 2016-11-14 13:56:46 +00:00
Brian Carlstrom
46abcdd83f Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 
am: d9ea80d009

Change-Id: I086d525fa3cdfd34d1b1ad5089662ea7eb57a418
 2016-11-14 13:55:41 +00:00
Narayan Kamath
19ee3109e1 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 
am: df3e599c7d

Change-Id: Ida0d973df74c0636e6b93df4af296cd74c3103cb
 2016-11-14 13:54:35 +00:00
Narayan Kamath
86e1929551 Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa 
am: 2f2611636b

Change-Id: Ie36e3041b72422b78a7335198671fc893c763614
 2016-11-14 13:53:28 +00:00
Narayan Kamath
f2a94f71fb Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa 
am: 44e645e59a

Change-Id: I950358108a9df60418e9d1370f55fdc81a2046f5
 2016-11-14 13:52:18 +00:00
Narayan Kamath
51930580bf Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6 
am: 327edfeba2

Change-Id: Ibe4a93c42a9594dce74b76a9ae6e2e32cb11b1e5
 2016-11-14 13:51:05 +00:00
Narayan Kamath
1886232f48 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6 
am: 58d1705c64

Change-Id: Ia768dae225459af1d7bcea6a7aa78bc2df170199
 2016-11-14 13:50:00 +00:00
Andriy Naborskyy
0a2ac837d1 Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours 
am: 18305d920e  -s ours

Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e
 2016-11-14 13:42:21 +00:00
Narayan Kamath
4c5dc7e622 Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb am: e58ee798c1 
am: 83be5fdebb

Change-Id: I31fd20827d22d0b8cb3b8df8db99e1b0aad6fa85
 2016-11-14 13:41:49 +00:00
Andriy Naborskyy
e26d15582b DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours 
am: f566a1d4bf  -s ours

Change-Id: I6323c0bc2a591cd3b50dd44b0ea519730f703b15
 2016-11-14 13:41:20 +00:00
neo.chae
7530ea7ec0 Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 
am: 4b72904585

Change-Id: I365cdb2764ffb15f233cfeb43339e6acbc369e49
 2016-11-14 13:40:37 +00:00
Brian Carlstrom
d9ea80d009 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 
am: 58612638d1

Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
 2016-11-14 13:40:16 +00:00
Xin Li
eb4de1706e Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f 
am: 6e8fef24d9

Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7
 2016-11-14 13:39:25 +00:00
Narayan Kamath
df3e599c7d Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 
am: 5f70cb0898

Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
 2016-11-14 13:39:05 +00:00
Narayan Kamath
2f2611636b Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d 
am: 8ea47824fa

Change-Id: I6d31e839b51896830ae42ddad01581743fd4bd28
 2016-11-14 13:38:01 +00:00
Narayan Kamath
44e645e59a Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 
am: fb207962aa

Change-Id: Ifad8cb21043c498097bcd7c459773cdfdcc98560
 2016-11-14 13:36:53 +00:00
Narayan Kamath
327edfeba2 Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 
am: 146a0f86a6

Change-Id: Ie77008fd0fcab39404ae817413096a0c10f88c6d
 2016-11-14 13:35:51 +00:00
Narayan Kamath
58d1705c64 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f 
am: f45a1a0fe6

Change-Id: Ie1cabf78ed27b3110e9b89c45c4fd02a4985231d
 2016-11-14 13:34:42 +00:00
Narayan Kamath
83be5fdebb Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb 
am: e58ee798c1

Change-Id: Ia1e984acaff549a83d4ab6373a9becc89bfd66ce
 2016-11-14 13:33:24 +00:00
Xin Li
f3e0e13b54 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311 
am: 5386c74a44

Change-Id: I122525c6a85e1542370835d88e83cad30f747bff
 2016-11-14 13:30:19 +00:00
Narayan Kamath
05f59b1f1d Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 
am: a9fae33c11

Change-Id: Idb4874c1c84d894bb20ac24dfc2c2035f9e1c10a
 2016-11-14 13:29:01 +00:00
Narayan Kamath
9efaadccc0 Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f 
am: a5ff6c84a2

Change-Id: I62e2180c0a3b2d9e2a11b3ad4d93288bed1ccef6
 2016-11-14 13:27:51 +00:00
Andriy Naborskyy
18305d920e Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours 
am: fb4beac069  -s ours

Change-Id: Id30081863fc467acb09bcc087596e3ec43aa3528
 2016-11-14 13:26:16 +00:00
Andriy Naborskyy
f566a1d4bf DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours 
am: dbbde14239  -s ours

Change-Id: I83f374c3a369b616009bc1381a317c21952698c8
 2016-11-14 13:25:11 +00:00
neo.chae
4b72904585 Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa 
am: aaf785c827

Change-Id: I34d0175499e1a47e3e6c9aecd2ac2805a6b4ad51
 2016-11-14 13:25:11 +00:00
Brian Carlstrom
58612638d1 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 
am: f9150bf362

Change-Id: I647f570452982cdf7202dccad793032305e61a9a
 2016-11-14 13:24:01 +00:00
Xin Li
6e8fef24d9 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b 
am: 20def2e75f

Change-Id: If0d5a1c14c181a8a476a00b66c9f8ba279f597e8
 2016-11-14 13:24:00 +00:00
Narayan Kamath
5ad1a52678 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b am: 65abe1066d am: a13068a1c8 
am: 3e85db46bc

Change-Id: I880788deb83685b523641097bf336d3233faad96
 2016-11-14 13:23:48 +00:00
Narayan Kamath
5f70cb0898 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 
am: 479385b6b3

Change-Id: Ia0c1b9e495a4bf78b3b12821a7a106a940c12e87
 2016-11-14 13:22:52 +00:00
Xin Li
5386c74a44 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 
am: 23270f1311

Change-Id: I242883361ff06daefe80686314e8869a3b6733f4
 2016-11-14 13:22:41 +00:00