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

296107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
8ea47824fa Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 
am: f3f784853d

Change-Id: Ia7aa7669db2bce172e325cb2c70facb3ca149974
 2016-11-14 13:21:40 +00:00
Hugo Benichi
bfa2fed779 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 
am: fd3e6e8d25

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

Change-Id: I8c2fd9f5e060fabe7fe5bc4e628f62d9de2f4769
 2016-11-14 13:21:23 +00:00
Narayan Kamath
a5ff6c84a2 Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 
am: c50c43667f

Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6
 2016-11-14 13:20:05 +00:00
Hugo Benichi
9a6f65608a DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c 
am: 1d61b01a5d

Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515
 2016-11-14 13:19:50 +00:00
Narayan Kamath
fb207962aa 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

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

Change-Id: I7eb37e002025b94267846d45680f24c3901fada9
 2016-11-14 13:17:13 +00:00
Narayan Kamath
f45a1a0fe6 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

Change-Id: I016ca17b09b2aa1ca3286f21ab6a534933482d1b
 2016-11-14 13:15:59 +00:00
Narayan Kamath
3e85db46bc 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

Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790
 2016-11-14 13:15:47 +00:00
Narayan Kamath
e58ee798c1 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

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

Change-Id: I9ea05d641c04178d067c35ae5d2f87ee35c86924
 2016-11-14 13:13:48 +00:00
Xin Li
20def2e75f 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

Change-Id: I114b678f9a47837a97758693f4c0e64e8eb17298
 2016-11-14 13:12:42 +00:00
Xin Li
23270f1311 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

Change-Id: I45d14e29bd7791cd3bd8fcca887478d8ac88d37a
 2016-11-14 13:11:30 +00:00
Narayan Kamath
56294db4d4 Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c 
am: 53af5fe3f7

Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13
 2016-11-14 13:10:53 +00:00
Narayan Kamath
5cbd448348 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe 
am: 11b3161c41

Change-Id: Ia63281de50ffd23664671780c2d75155dbc66260
 2016-11-14 13:10:17 +00:00
Andriy Naborskyy
fb4beac069 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

Change-Id: I2d9f5bf351026cd697b75b1c60a177232cdb2266
 2016-11-14 13:09:40 +00:00
Hugo Benichi
fd3e6e8d25 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce 
am: 4bdf37c204

Change-Id: Ida3b6e2739f273228826f1536e2573d9456c2956
 2016-11-14 13:09:34 +00:00
Narayan Kamath
c50c43667f Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca 
am: 87dc13f249

Change-Id: I7e23610ef0799dcfb3ac3598011280de22ffc25f
 2016-11-14 13:09:06 +00:00
Hugo Benichi
1d61b01a5d DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours 
am: bdf4d8a93c

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

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

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

Change-Id: If3d7584fef21c97c9dd9350b385c86bd0dfc1231
 2016-11-14 13:07:09 +00:00
Narayan Kamath
479385b6b3 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 
am: 52021073a4

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

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

Change-Id: I1a30989e0fd2ced4a7e298ae26e76f3525c03362
 2016-11-14 13:03:02 +00:00
Narayan Kamath
3b89a68a08 Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa 
am: d212aa9d13

Change-Id: I477b2582bd31e1f9d1b53ea6bfdad78267fc6bfc
 2016-11-14 13:01:42 +00:00
Narayan Kamath
1f9abe310f 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

Change-Id: Iaa46542e0484c3a9e175f492790583482b4f088b
 2016-11-14 13:00:21 +00:00
Narayan Kamath
4a204149eb 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

Change-Id: I11ecc3013e1de3951b12945c486cca7ad78d38ed
 2016-11-14 12:59:01 +00:00
Narayan Kamath
53af5fe3f7 Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b 
am: 59e6dccb4c

Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99
 2016-11-14 12:57:59 +00:00
neo.chae
0212d4f3fa Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c 
am: 7489336fed

Change-Id: I53fb00542e417e200b46ac941b4255e310348e18
 2016-11-14 12:57:53 +00:00
Hugo Benichi
4bdf37c204 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 
am: 37cacc77ce

Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6
 2016-11-14 12:56:47 +00:00
Xin Li
ee6b51a05b 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

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11
 2016-11-14 12:56:36 +00:00
Hugo Benichi
bdf4d8a93c DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev 
am: 476da32d86  -s ours

Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f
 2016-11-14 12:55:35 +00:00
Xin Li
05a61276c6 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

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057
 2016-11-14 12:55:17 +00:00
Narayan Kamath
11b3161c41 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c
 2016-11-14 12:54:10 +00:00
Narayan Kamath
87dc13f249 Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 
am: d98e75feca

Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add
 2016-11-14 12:52:53 +00:00
Narayan Kamath
65abe1066d Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 
am: 8e6e5a157b

Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
 2016-11-14 12:51:41 +00:00
Narayan Kamath
59e6dccb4c Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e 
am: d17867203b

Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
 2016-11-14 12:50:15 +00:00
Hugo Benichi
37cacc77ce Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae 
am: afa3694ea9

Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417
 2016-11-14 12:49:00 +00:00
Hugo Benichi
476da32d86 DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev 
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
 2016-11-14 21:35:45 +09:00
Bartosz Fabianowski
48e696141f Add metrics constant for Enterprise Privacy Settings page 
This CL adds a metrics constant for the Enterprise Privacy page in
the Settings app.

Test: None
BUG: 32692748
Change-Id: Ifd5429b7db6c2d85858ed4128a5fba4f788911ac
 2016-11-14 13:21:02 +01:00
Michal Karpinski
aabe96db87 [DPM] Minor code fixes in NetworkLoggingHandler 
Added a comment and renamed field to follow mConvention.

Test: will be CTS tested once APIs unhidden
Bug: 29748723
Change-Id: I351be4680eed9c4ab51365e1b983b452ca210858
 2016-11-14 12:10:39 +00:00
TreeHugger Robot
b53e048b92 Merge "[DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times" 2016-11-14 12:04:07 +00:00
Jerome Gaillard
7638c49c84 Change date on CustomCalendar 
The date of the calendar is set by converting the epoch time based on
the local time zone. We choose at date at 12:00 GMT so that it will
be on the same day no matter which time zone is considered.

Test: part of testActivity
Change-Id: Ib36a5b45f69323265dd5ceaa17eeac553fc2d071
(cherry picked from commit 896cc3a794bb6e173c1e53e97f70007c3e24de38)
 2016-11-14 11:01:33 +00:00
Jerome Gaillard
4570fc9f28 Merge "Rename native methods that were changed in the platform" 2016-11-14 11:00:51 +00:00
Michal Karpinski
a9ff206af2 [DPM] DO uses batch token to retrieve network logs, and can retrieve 
the same batch many times

This allows DO to:
a) know that some logs were dropped (by trying with token and not
getting anything)
b) know how many logs were there in each batch (useful especially
for the dropped ones)
c) retry batch retrieval if it failed

Test: will be CTS tested once APIs unhidden
Bug: 29748723
Change-Id: I788359242e3b2a4cb638edb25e5db8b25646c29f
 2016-11-14 10:26:55 +00:00
Hugo Benichi
d1b6feeef3 Merge "Fix flaky IpPrefixTest." 2016-11-13 11:58:38 +00:00
Hugo Benichi
32c6870403 Fix flaky IpPrefixTest. 
Test: IpPrefixTest passes
Bug: 32561414
Change-Id: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
 2016-11-13 20:51:05 +09:00
Wale Ogunwale
059de0230b Merge "Removed used of DisplayContent.getReadOnlyWindowList()" 2016-11-13 01:01:11 +00:00
TreeHugger Robot
357c6e5e5b Merge "Fixing issue where PIP did not stay minimized after rotation." 2016-11-12 04:59:13 +00:00