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

283353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-hung Hsieh
edd824b94a Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 
am: 4836d07980

Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa
 2016-08-31 17:34:11 +00:00
Chih-hung Hsieh
4836d07980 Merge "Fix google-explicit-constructor warnings in media/mca." 
am: 2cace65f71

Change-Id: I4eb234c60ce33f34e91b40661736231237c472b2
 2016-08-31 17:27:58 +00:00
Chih-hung Hsieh
7207562ff7 Merge "Fix google-explicit-constructor warnings in libs/hwui." 2016-08-31 17:18:56 +00:00
Chih-hung Hsieh
2cace65f71 Merge "Fix google-explicit-constructor warnings in media/mca." 2016-08-31 17:18:29 +00:00
Neil Fuller
0aa7d4bb3f Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 
am: ef1fb4889a

Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3
 2016-08-31 16:47:33 +00:00
Geoffrey Pitsch
33c623677d Fix systemui tests on APCT. 
Different mockito library for junit4.
This causes class loading failures for them but not our builds.

Change-Id: Iae4ba584f83e0ab78505fa822a74f5998fbca395
 2016-08-31 12:47:29 -04:00
Neil Fuller
ef1fb4889a Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7
 2016-08-31 16:43:22 +00:00
Neil Fuller
680ec020a1 Merge "Fix receive timeout on LocalSocket" 
am: 7a9c0cd854

Change-Id: I4148f467921ad6a627fe8ebc5225e2de6717270f
 2016-08-31 16:35:24 +00:00
Neil Fuller
7a9c0cd854 Merge "Fix receive timeout on LocalSocket" 2016-08-31 16:28:17 +00:00
Chong Zhang
d642f479d1 Merge "Add the null ptr check that's not merged in master" 2016-08-31 16:00:52 +00:00
Sergio Giro
016e850921 Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0 
am: 61c0996d6f

Change-Id: I4ea45e1007f5bbbd086d200f5be9227a03eab44d
 2016-08-31 14:21:41 +00:00
Sergio Giro
61c0996d6f Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 
am: e639bbd7d0

Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d
 2016-08-31 14:15:46 +00:00
Sergio Giro
22b8317a49 Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287 
am: d4b193c30c

Change-Id: I34fac82dc8bfbd157b70b637a13d188692b3b5e2
 2016-08-31 14:09:44 +00:00
Sergio Giro
e639bbd7d0 Merge "java.security.Principal: add default method Principal#implies" 
am: 0c8c4a5d98

Change-Id: I4708b9cee5059b588e829853264484782e251efb
 2016-08-31 14:09:42 +00:00
Sergio Giro
d4b193c30c Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc 
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145
 2016-08-31 14:04:09 +00:00
Sergio Giro
8a5790a287 Merge "java.security.SecretKey: now extends from Destroyable" 
am: c7bd0d0adc

Change-Id: I3382bd7f225e6a487dbf4b6aa74000981f40a70e
 2016-08-31 13:58:11 +00:00
Sergio Giro
0c8c4a5d98 Merge "java.security.Principal: add default method Principal#implies" 2016-08-31 13:51:37 +00:00
Sergio Giro
c7bd0d0adc Merge "java.security.SecretKey: now extends from Destroyable" 2016-08-31 13:50:23 +00:00
Sergio Giro
87ececf5c8 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b 
am: e04c029ed5

Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc
 2016-08-31 12:51:16 +00:00
Sergio Giro
e04c029ed5 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 
am: 565c1fbf8b

Change-Id: Iec116355209c0770b4125142f93873766e29d61d
 2016-08-31 12:42:32 +00:00
Sergio Giro
565c1fbf8b Merge "java.security: update java.security.KeyStore to jdk8u60" 
am: d53ae2c285

Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d
 2016-08-31 12:31:33 +00:00
Sergio Giro
d53ae2c285 Merge "java.security: update java.security.KeyStore to jdk8u60" 2016-08-31 12:24:48 +00:00
Neil Fuller
a8280a5d34 Fix receive timeout on LocalSocket 
The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.

Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
 2016-08-31 11:32:17 +01:00
Tony Mak
72b817d1e6 Merge "Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner" 2016-08-31 10:16:59 +00:00
Sergio Giro
7790666747 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b 
am: 0ac5c50850

Change-Id: Iebb89cfa34482e3af937a6e15c97b146e875ebef
 2016-08-31 08:37:24 +00:00
Sergio Giro
0ac5c50850 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 
am: 47f7d8384b

Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb
 2016-08-31 08:31:17 +00:00
Sergio Giro
47f7d8384b Merge "java.security.cert: update classes in java.security.cert (part 2)" 
am: 9484bff017

Change-Id: Idb12e10674a34ebfd3cf0236cc8cbde1979e5cb7
 2016-08-31 08:26:25 +00:00
Sergio Giro
9484bff017 Merge "java.security.cert: update classes in java.security.cert (part 2)" 2016-08-31 08:18:57 +00:00
Brian Carlstrom
5a24d588d1 Merge "add dri device to zygote whitelisted FDs" 2016-08-31 05:25:24 +00:00
John Reck
f31a551448 Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 25c6b37613 am: 24a082cd49 am: 8960d573f2 
am: 2952597e7f

Change-Id: I2ffc729c026575b42787977e58a26ac94b13fa46
 2016-08-31 04:59:40 +00:00
Chris Craik
0d11e482b0 Cherry pick TextureView fixes am: 2e8a8a2432 am: 05cb60846c am: 2e5e9feaef am: 726728d148 
am: e57c721c12

Change-Id: I320f641971f152773016aadbdbb01482593cbf87
 2016-08-31 04:59:36 +00:00
Adrian Salido
9b160d1be2 add dri device to zygote whitelisted FDs 
The driver can be used just like /dev/ion for graphic buffers.

Bug: 31172436
Change-Id: I4f76e398b58a684f614f72ce7ef6bdd049ea7655
(cherry picked from commit 8977e424ee2d6d85fec419532ae510131aa88c45)
 2016-08-31 04:58:22 +00:00
Pankaj Kanwar
fd61cfbd08 Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev am: 8a4db04893 am: ce53fb13c8 
am: 5ba225652a

Change-Id: I4293e1ae0ee04595c11189f995a65f609a89fc71
 2016-08-31 04:53:48 +00:00
Ajay Panicker
5587c17ad5 Allow getResponseCode to block if response hasn't been received from remote am: c3ae4db069 am: ffabe1cf7d 
am: fb91f41e04

Change-Id: Idd0dfbf7b75533ea8b65849b40da55583d84dac1
 2016-08-31 04:53:45 +00:00
Philip P. Moltmann
9402211ce6 Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev am: 23f6f13eab am: da2ea93dbe 
am: 197fbeebce

Change-Id: Ic248f01fb0846ba4a778412f8804c74a7ccebb03
 2016-08-31 04:53:42 +00:00
Philip P. Moltmann
94e8050806 Hold no locks when calling RemotePrintSpooler am: 1d6e7cc536 am: 684aa472cd 
am: ed30002d12

Change-Id: Ief32708f5f2745e1f27c15b5d174acc0f97f9719
 2016-08-31 04:53:39 +00:00
Yohei Yukawa
9f12f39f8a Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41 am: 15946bd93c am: 04e7bc8ea4 am: 7dd5f81c42 
am: deb91b89f9

Change-Id: I3d0c5ee63fc1101f2d39b6c10cacb36df3a65a03
 2016-08-31 04:53:35 +00:00
Yohei Yukawa
be317225c0 Make sure IME focus is synced to View focus am: 8eb07090a4 -s ours am: ef53c0f5ec am: 74e5244fde am: e79b052f51 
am: 7142f1cd62

Change-Id: Ic51af041777ce8c517cf17560a77d5bd6ce4e2f3
 2016-08-31 04:37:32 +00:00
Ben Lin
e5817f3313 Merge "Push delete notification when Bug reports are deleted." into nyc-mr1-dev am: cd97d925c0 am: 993f368dc5 
am: c0b3b23f43

Change-Id: I30c8aae1517ff217f12c709176a5f58b4aa30a38
 2016-08-31 04:37:23 +00:00
Ben Lin
663e0e97d5 Push delete notification when Bug reports are deleted. am: 86805aa3af am: 64146c5d24 
am: b01be62d58

Change-Id: I8e1b6dc42e44307feef1ba912a3465c2d25594e1
 2016-08-31 04:37:16 +00:00
Chet Haase
85c1d8dfb0 Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb472858 am: 6a8b5585aa am: d987f227e1 am: e0426bc12a 
am: ff65f5e37a

Change-Id: I6fcf22a7a17772a780a12097e77015e3e2883e85
 2016-08-31 04:37:09 +00:00
Yuichi Biwa
06ee762461 ChooserActivity: Cannot start app that the icon overflows the layout am: cb3e1237b5 am: 96ecd77dc8 am: d728854401 am: 94cdd1c23e 
am: a52f1b4116

Change-Id: I72a926eb8b13e6fbe4656f9d0f01c392d66a10e2
 2016-08-31 04:37:05 +00:00
Chet Haase
37b4a80d38 Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c am: 26849eca9c am: 20c29b0c9b am: 1861b0b4d0 
am: 7536a773cc

Change-Id: I8165af88d024cbf7059bf47def81f3b444993bdb
 2016-08-31 04:31:15 +00:00
Alan Viverette
13de77151b Set up view state before attaching, jump drawables if needed am: c328f042a6 -s ours am: 54e7cbe563 am: 257d8ea408 am: baa4e40740 
am: cb19d9637e

Change-Id: Ia0b18ac7341167133dbaa0ac912276a148e97b01
 2016-08-31 04:31:09 +00:00
Chet Haase
4b2a2a7b71 Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am: a1bbb76806 am: 373f7c04fd am: d89f74710c am: 950217589f 
am: f9357c4aa5

Change-Id: I1e55b278fadd2985b8d755ebd20fa18bb027c48f
 2016-08-31 04:31:01 +00:00
Adam Powell
7256969e9a Force AlertDialogLayout to have gravity start|top am: 00c4f7ba65 am: 96bdf5ca7b am: 5d7e5ef0ef am: 357487c9ea 
am: 7ed976de65

Change-Id: Ifea1942f4e3a7f00a0af1cd062e0a4ebbebe67a6
 2016-08-31 04:30:57 +00:00
Chet Haase
e3b6fddf19 Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am: c80a4d7ae3 am: 6ff5fafeca am: 73b9053643 am: 8ee346bf4b 
am: c570e9ea76

Change-Id: I1df4ca39ab6bc95d2bbf02a36f5f5a1d2ae55801
 2016-08-31 04:30:53 +00:00
Abodunrinwa Toki
e74adb802f FloatingActionMode: Fix screen coordinates. am: 99c340cad9 am: cba50af05e am: 7571fabd8a am: c89b73f43a 
am: 7ab6386e04

Change-Id: I31983c296013ce7367033d14eeee4e05821b8f30
 2016-08-31 04:25:43 +00:00
Fei Wu
6745bf30a1 Merge "Use png for switch in SwitchPreference on watch" into cw-f-dev am: 40d869222f 
am: 8bea286a0c

Change-Id: If8632e9c3059ad9854ca9299857a00bd97f295f9
 2016-08-31 04:25:36 +00:00
FEI WU
f6ebf87927 Use png for switch in SwitchPreference on watch am: 798e2ba605 
am: 0eac3bb98e

Change-Id: Id3f90e96ed5b6bacfb0618a2ac16a111bc226da4
 2016-08-31 04:25:29 +00:00