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

316291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hangyu Kuang
f3276baa03 Merge "media: Address API review comments" into oc-dev am: ab312729ce 
am: bde6da6f18

Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f
 2017-04-17 17:20:20 +00:00
Andrii Kulian
058e1908b2 Merge "Temporary remove resource-display caching" into oc-dev am: 8f4bd67929 
am: 8063101678

Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400
 2017-04-17 17:17:19 +00:00
Bryce Lee
242a4f6e5d Merge "Don't allow stacks above pinned stack." into oc-dev am: 22d4ef008d 
am: e7ac364ae1

Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54
 2017-04-17 17:16:09 +00:00
Hangyu Kuang
bde6da6f18 Merge "media: Address API review comments" into oc-dev 
am: ab312729ce

Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe
 2017-04-17 17:13:17 +00:00
TreeHugger Robot
71483a891a Merge "use sk_sp to manage colortables" 2017-04-17 17:11:33 +00:00
Andrii Kulian
8063101678 Merge "Temporary remove resource-display caching" into oc-dev 
am: 8f4bd67929

Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5
 2017-04-17 17:08:29 +00:00
Bryce Lee
e7ac364ae1 Merge "Don't allow stacks above pinned stack." into oc-dev 
am: 22d4ef008d

Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1
 2017-04-17 17:07:09 +00:00
Hangyu Kuang
ab312729ce Merge "media: Address API review comments" into oc-dev 2017-04-17 17:04:28 +00:00
Dianne Hackborn
bcc7cebcdb Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" 2017-04-17 17:03:00 +00:00
Andrii Kulian
8f4bd67929 Merge "Temporary remove resource-display caching" into oc-dev 2017-04-17 17:00:06 +00:00
Bryce Lee
22d4ef008d Merge "Don't allow stacks above pinned stack." into oc-dev 2017-04-17 16:57:17 +00:00
Andrii Kulian
cff2f814a8 Temporary remove resource-display caching 
An instance of ResourceKey may correspond to different instances
of Resources at different points in time. This can lead to old
instances of Display returned from cache even if resources have
changed.
We need to ensure 1:1 correspondence between Resources and
ResourceKey before using this kind of cache. Disabling it for now
to fix CTS.

Change-Id: Ib53550c4f2d969c06a570ab6051529269b04b38d
Fixes: 37328072
Fixes: 37305567
Bug: 33430498
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: android.app.cts.DisplayTest#testRotation
 2017-04-17 16:56:55 +00:00
Android Build Merger (Role)
a5fefb2fe2 Merge "Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec am: 17bc64597c" 2017-04-17 16:53:33 +00:00
Jordan Liu
c0c2c99929 Merge "Update api for ServiceStateProvider" 2017-04-17 16:53:17 +00:00
Sundeep Ghuman
f509d526b8 Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec 
am: 17bc64597c

Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e
 2017-04-17 16:52:31 +00:00
Sundeep Ghuman
17bc64597c Merge "Synchronously update APs in during forceUpdate." into oc-dev 
am: 6bdbc4abec

Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3
 2017-04-17 16:42:31 +00:00
Julia Reynolds
1ab0f123bb Merge "Also use the notification's sound for the misc channel" into oc-dev am: ed8f49efdc 
am: f6ca4cfcd2

Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
 2017-04-17 16:42:07 +00:00
TreeHugger Robot
6bdbc4abec Merge "Synchronously update APs in during forceUpdate." into oc-dev 2017-04-17 16:35:00 +00:00
Julia Reynolds
f6ca4cfcd2 Merge "Also use the notification's sound for the misc channel" into oc-dev 
am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
 2017-04-17 16:33:11 +00:00
TreeHugger Robot
ed8f49efdc Merge "Also use the notification's sound for the misc channel" into oc-dev 2017-04-17 16:23:55 +00:00
Julia Reynolds
39e00e1203 Merge "Remove @removed method" into oc-dev am: bbcf5fba1c 
am: 211d99d1b9

Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0
 2017-04-17 15:17:48 +00:00
Julia Reynolds
211d99d1b9 Merge "Remove @removed method" into oc-dev 
am: bbcf5fba1c

Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
 2017-04-17 15:09:24 +00:00
TreeHugger Robot
bbcf5fba1c Merge "Remove @removed method" into oc-dev 2017-04-17 15:01:54 +00:00
Julia Reynolds
b9e712ebde Also use the notification's sound for the misc channel 
Even if it's nonexistent.

Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045
 2017-04-17 14:33:30 +00:00
Todd Kennedy
56f715160e Merge "expose the instant app installer component" into oc-dev am: 676590d060 
am: 8d0dacb5b1

Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
 2017-04-17 14:32:38 +00:00
Todd Kennedy
8d0dacb5b1 Merge "expose the instant app installer component" into oc-dev 
am: 676590d060

Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
 2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060 Merge "expose the instant app installer component" into oc-dev 2017-04-17 14:17:27 +00:00
Jaewan Kim
d9c01f2532 Merge "MediaSessionService: Cache active sessions per an user" into oc-dev am: 5fc6e63e2e 
am: 18a6331772

Change-Id: I854db28eaf942b8d4b6035ccc35be65bf4eee774
 2017-04-17 07:39:11 +00:00
Jaewan Kim
18a6331772 Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 
am: 5fc6e63e2e

Change-Id: I8a444b4b36fe01097dc3c4e21e0df8294ada56a1
 2017-04-17 07:29:40 +00:00
TreeHugger Robot
5fc6e63e2e Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 2017-04-17 07:21:01 +00:00
Erik Kline
461a832adc Merge changes I76ae853c,If94102c7 into oc-dev am: 7eb8260236 
am: feac32ced9

Change-Id: Id87d4ef2a14572c93bece1f19b3da8f73980d708
 2017-04-17 05:29:00 +00:00
Erik Kline
feac32ced9 Merge changes I76ae853c,If94102c7 into oc-dev 
am: 7eb8260236

Change-Id: I29e7e076b74842098d5de36aa965a736f1a2863c
 2017-04-17 05:19:35 +00:00
TreeHugger Robot
7eb8260236 Merge changes I76ae853c,If94102c7 into oc-dev 
* changes:
  Ignore potential SystemProperties errors when setting net.dns
  Make ConnectivityServiceTest pass on wifi-only devices.
 2017-04-17 05:11:21 +00:00
Winson Chung
1ff2dbd912 Use vsync choreographer when moving PIP. am: 487737b876 
am: 4cc5518c80

Change-Id: I43e66e892ae3e67336e18d9a55d6074bc0e75167
 2017-04-17 02:00:18 +00:00
Winson Chung
4cc5518c80 Use vsync choreographer when moving PIP. 
am: 487737b876

Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
 2017-04-17 01:50:43 +00:00
Hugo Benichi
919f128a16 ConnectivityManager: unify prety printing of callback types. 
And also remove some small code duplication (checkNotNull).

Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
 2017-04-17 08:50:58 +09:00
Winson Chung
487737b876 Use vsync choreographer when moving PIP. 
Bug: 36371375
Test: Enter PIP, move PIP
Change-Id: I5956a3ed9e92a4cdd4bf0a55723b9f1574c1a86f
 2017-04-16 16:45:18 -07:00
Dianne Hackborn
855aa45b88 Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED 
Test: booted and ran.
Change-Id: Id972da711188177ca3ac38a22efa04c5901e7d47
 2017-04-16 14:59:08 -07:00
Tyler Gunn
199426d156 Merge "Expose phone account register/unregister intents." am: 24299f5b06 am: b993a44272 am: d046aa9103 
am: 03dbae246e  -s ours

Change-Id: I0b7e021287a51b71d8ac996a659fc3383445ddb3
 2017-04-15 22:35:11 +00:00
Nathan Harold
f923fb5e13 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 am: d50a325553 am: 661278432d 
am: 23e6899924

Change-Id: I53c03893629be1662f3f5922011d600b19e878bf
 2017-04-15 22:33:43 +00:00
Tyler Gunn
03dbae246e Merge "Expose phone account register/unregister intents." am: 24299f5b06 am: b993a44272 
am: d046aa9103

Change-Id: Iece85cdaee561d2e32c634bed2f2bc03a635450c
 2017-04-15 22:28:09 +00:00
Nathan Harold
23e6899924 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 am: d50a325553 
am: 661278432d

Change-Id: Ie6ed56a31df7a4b9e0730693561786562eb42fc9
 2017-04-15 22:26:36 +00:00
Rebecca Silberstein
01ffba80d9 Merge "Add a default SSID prefix for local only hotspot" into oc-dev am: d8837b6fca 
am: f7ff103c55

Change-Id: I365fb0b25e02f76c32a05217d98112a4c3241a4e
 2017-04-15 20:50:00 +00:00
Rebecca Silberstein
f7ff103c55 Merge "Add a default SSID prefix for local only hotspot" into oc-dev 
am: d8837b6fca

Change-Id: I8703b838c83a71f5be27d07e1a514bf4c8d22a17
 2017-04-15 20:42:34 +00:00
Rebecca Silberstein
d8837b6fca Merge "Add a default SSID prefix for local only hotspot" into oc-dev 2017-04-15 20:37:37 +00:00
Ray Essick
697580cc56 Merge "Rework getMetrics() api per API council" into oc-dev am: abbea1df6b 
am: b3934d9043

Change-Id: I0f463f2d04da9a5ecd8ddcad965ce8821b0ee116
 2017-04-15 19:08:10 +00:00
Ray Essick
b3934d9043 Merge "Rework getMetrics() api per API council" into oc-dev 
am: abbea1df6b

Change-Id: I9b8911d615e9521007a1cbb14514d05aef172f57
 2017-04-15 19:01:18 +00:00
TreeHugger Robot
abbea1df6b Merge "Rework getMetrics() api per API council" into oc-dev 2017-04-15 18:52:06 +00:00
Yifan Hong
6cc2d70762 Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev am: 35edfc1fdc 
am: 6955963d18

Change-Id: I04617ab2fc8775616aa76f326a2360e6c7bebf69
 2017-04-15 10:11:24 +00:00
Yifan Hong
6955963d18 Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev 
am: 35edfc1fdc

Change-Id: I0b604d7e6faf1b72bb7271fbb4ad7056f9d800ae
 2017-04-15 10:04:52 +00:00