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

296068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
f4ebe2e2cc Removed WallpaperController dependency on WindowList. 
WallpaperController now accesses the container hierarchy directly
to determine the state of the wallpaper windows and targets.

Bug: 30060889
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test \
      android.server.cts.ActivityManagerTransitionSelectionTests

Change-Id: Ib70beaf340f257ad4e1093cc127f81e7adf41636
 2016-11-14 11:03:52 -08:00
TreeHugger Robot
49642fff29 Merge "Import translations. DO NOT MERGE" 2016-11-14 18:38:18 +00:00
TreeHugger Robot
b439a4528a Merge "Import translations. DO NOT MERGE" 2016-11-14 18:33:34 +00:00
Tyler Gunn
ccacc5d32d Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am: 8223dc1ae9 am: 8b58e73c48 am: 9e976c8565 
am: 4a15007915

Change-Id: I40d164a429d05870b2f760e6740d3f27b3e2f224
 2016-11-14 18:32:04 +00:00
TreeHugger Robot
93dd397c59 Merge "Import translations. DO NOT MERGE" 2016-11-14 18:30:10 +00:00
Tyler Gunn
4a15007915 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am: 8223dc1ae9 am: 8b58e73c48 
am: 9e976c8565

Change-Id: If743a67bff170096f028c7d7f3fc88c8548dfbf1
 2016-11-14 18:22:14 +00:00
Tyler Gunn
9e976c8565 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am: 8223dc1ae9 
am: 8b58e73c48

Change-Id: Ifdbfdb2f418297eae83a69196462dc847650e3e2
 2016-11-14 18:15:12 +00:00
Sohani Rao
db9bcdac6f Merge "Permissions check for Wifi Display configuration" 2016-11-14 18:11:07 +00:00
Andreas Gampe
3941bddc6f Merge "resolve merge conflicts of 50c5f04 to master" 2016-11-14 18:09:35 +00:00
Tyler Gunn
8b58e73c48 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." 
am: 8223dc1ae9

Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
 2016-11-14 18:08:11 +00:00
TreeHugger Robot
18fe8f6359 Merge "Added a callback for AutoFillService." 2016-11-14 17:56:59 +00:00
Andreas Gampe
6b59a74330 resolve merge conflicts of 50c5f04 to master 
Change-Id: I2b1154e636258ccce6c4482415752444d2ac1326
 2016-11-14 09:42:42 -08:00
Narayan Kamath
50c5f04262 Zygote: Additional whitelists for runtime overlay / other static resources. 
am: 9087f331a8

Change-Id: I800230fd9a4baf543d53834b00019f81aa07bdc9
 2016-11-14 17:25:09 +00:00
Narayan Kamath
9087f331a8 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)
 2016-11-14 09:07:32 -08:00
TreeHugger Robot
2c2fb6189c Merge "Allow cross profile call between DO and PO" 2016-11-14 16:27:56 +00:00
Tyler Gunn
8223dc1ae9 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." 2016-11-14 16:23:43 +00:00
Michal Karpinski
445c692bce Merge "[DPM] Minor code fixes in NetworkLoggingHandler" 2016-11-14 16:21:37 +00:00
TreeHugger Robot
d43d705735 Merge "Revert "Add Build.isAtLeastO"" 2016-11-14 15:46:17 +00:00
Steven Moreland
1662b38f4e Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139 am: 5f9ac42029 am: cd0f045eb7 
am: d3a15478a7

Change-Id: If7a15e25ad9c9110c12a114a181a6c4a6bc21b6d
 2016-11-14 15:37:14 +00:00
Steven Moreland
d3a15478a7 Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139 am: 5f9ac42029 
am: cd0f045eb7

Change-Id: Iecdc2bd4e06fdd8e6b2e2217c8c988dcabceda25
 2016-11-14 15:29:39 +00:00
Steven Moreland
cd0f045eb7 Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139 
am: 5f9ac42029

Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db
 2016-11-14 15:22:35 +00:00
Steven Moreland
5f9ac42029 Merge "hidl: Update for IFoo::descriptor -> const char *." 
am: e17e68f139

Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
 2016-11-14 15:15:39 +00:00
Treehugger Robot
e17e68f139 Merge "hidl: Update for IFoo::descriptor -> const char *." 2016-11-14 15:03:32 +00:00
Bartosz Fabianowski
863fb378ea Merge "Add metrics constant for Enterprise Privacy Settings page" 2016-11-14 15:01:33 +00:00
Andriy Naborskyy
b7fae82de8 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 am: 415ec85fdb -s ours am: 5c47b5ec06 -s ours 
am: fd9358530a  -s ours

Change-Id: I33e0bc9875ab4b078cd79bc6c48b4b098091ace8
 2016-11-14 14:36:57 +00:00
Andriy Naborskyy
e38fb5c054 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 am: bb1dfdc660 -s ours am: 2480121100 -s ours 
am: 9635303d5f  -s ours

Change-Id: Icb174103be637ccfd8f4a1fa3cd511c3a074f77c
 2016-11-14 14:35:51 +00:00
Brian Carlstrom
ff1c089fc8 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009 am: 46abcdd83f am: 35063cdb3c 
am: 081d505073

Change-Id: I6969b463fd780c9cc89e9c03c5da75ae2f17e455
 2016-11-14 14:34:39 +00:00
Narayan Kamath
eb40a86f26 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d am: 19ee3109e1 am: bf3c83eeac 
am: 11959bd5fc

Change-Id: I8caf4888a5b7294ef0b7d958057ea4e7ddf971a5
 2016-11-14 14:27:29 +00:00
Narayan Kamath
46e3851a77 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 am: 86e1929551 am: 8ecbb2b2ae 
am: 5db2340ba2

Change-Id: I6ce389eb25162f90dc39a3f023ee7f35eccfcfe4
 2016-11-14 14:26:12 +00:00
Narayan Kamath
5b2a615957 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 am: f2a94f71fb am: 48d16243f9 
am: aa9b2b17fd

Change-Id: I6aa9a19451ac9d9c800659d172f54db456fabb21
 2016-11-14 14:24:48 +00:00
Andriy Naborskyy
fd9358530a 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 am: 415ec85fdb -s ours 
am: 5c47b5ec06  -s ours

Change-Id: I3a438d3b5945da3fbcb8e6a655e53813d0094b74
 2016-11-14 14:24:29 +00:00
Narayan Kamath
f1ee7ebace 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 am: 51930580bf am: deabe2c324 
am: 0bcb75b5e8

Change-Id: I86753028179da82f2ede9da82a2274d25bdf2ec6
 2016-11-14 14:23:20 +00:00
Andriy Naborskyy
9635303d5f 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 am: bb1dfdc660 -s ours 
am: 2480121100  -s ours

Change-Id: Id4cf19f648862cfb25499f532d68d9bc791b16ba
 2016-11-14 14:23:17 +00:00
Brian Carlstrom
081d505073 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009 am: 46abcdd83f 
am: 35063cdb3c

Change-Id: I7c6bae206f08cc4eeeaf7f8b444f5847812600cf
 2016-11-14 14:22:02 +00:00
Narayan Kamath
2be8f11417 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 am: 1886232f48 am: 9facd98e75 
am: 38481c8a0f

Change-Id: If132e49ca549ac533a4d7adca0fa0d195e0cd0de
 2016-11-14 14:22:02 +00:00
Tony Mak
46aabe5ef4 Allow cross profile call between DO and PO 
Allow DO to bind service of PO in managed profile and vice versa.
DO and PO must be the same package.

Bug: 31895999

Change-Id: I3ce2943aebd1249401d5814757a0ce25b9f85279
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.CorpOwnedManagedProfileTest
 2016-11-14 14:20:11 +00:00
Jerome Gaillard
99bb2b3d80 Merge "Change date on CustomCalendar" 2016-11-14 14:16:29 +00:00
Narayan Kamath
69bbca1dd7 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 am: 4c5dc7e622 am: 6b7badc832 
am: eda7110973

Change-Id: I2d7917ee12bcab86f313863051b9c27b2a73fa78
 2016-11-14 14:14:18 +00:00
Narayan Kamath
11959bd5fc Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d am: 19ee3109e1 
am: bf3c83eeac

Change-Id: I05d77dbca719382340c1df02c2f3c513118e64f9
 2016-11-14 14:14:16 +00:00
neo.chae
0f51573bff 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 am: 7530ea7ec0 am: fa2e233c30 
am: b1d07e379c

Change-Id: I13c101d6ff3e8f86358972b2d79703be07c3e7d0
 2016-11-14 14:13:11 +00:00
Narayan Kamath
5db2340ba2 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 am: 86e1929551 
am: 8ecbb2b2ae

Change-Id: Ifdc128e39b8a34731a972049c398a7e3784f5303
 2016-11-14 14:13:00 +00:00
Xin Li
2fc7ea4949 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 am: eb4de1706e am: 9d04aa4f81 
am: 8ce3691f79  -s ours

Change-Id: If2967655e9fa921b303568a0855b244c0eef0d20
 2016-11-14 14:11:51 +00:00
Narayan Kamath
aa9b2b17fd 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 am: f2a94f71fb 
am: 48d16243f9

Change-Id: I70ce50374b406443d58f07409bfa58335e96e8de
 2016-11-14 14:11:46 +00:00
Andriy Naborskyy
5c47b5ec06 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 
am: 415ec85fdb  -s ours

Change-Id: I3fe6e41b3a2b6119a7d980227756054a2267b797
 2016-11-14 14:11:10 +00:00
Narayan Kamath
0bcb75b5e8 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 am: 51930580bf 
am: deabe2c324

Change-Id: If6bf0b5dac1c7b9141462b9c28c5f0bf76bdceca
 2016-11-14 14:10:20 +00:00
Xin Li
2df92b919e 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 am: f3e0e13b54 am: 3a86cff442 
am: 2129e3b757  -s ours

Change-Id: Ie712c3d1613b378df3f832019bb25c78aaf7bf38
 2016-11-14 14:10:19 +00:00
Andriy Naborskyy
2480121100 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 
am: bb1dfdc660  -s ours

Change-Id: I230967ab2be77179282d37ea186906adabfafde5
 2016-11-14 14:09:55 +00:00
Narayan Kamath
38481c8a0f 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 am: 1886232f48 
am: 9facd98e75

Change-Id: I5b57c5a660562defc701ad4db67a4bc60cf3cc90
 2016-11-14 14:09:01 +00:00
Narayan Kamath
f5d2a4eb6a Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11 am: 05f59b1f1d am: ec69d20c3d 
am: 3fca84af72

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

Change-Id: Ie195e5ab259ed009a311dc5f17522c2d6599fe32
 2016-11-14 14:08:51 +00:00