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

316317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
35edfc1fdc Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev 2017-04-15 10:01:25 +00:00
Stephen Chen
4c36c8a381 Merge "Remove ScoredNetwork.BADGING constants." into oc-dev am: e587591c5a 
am: 45a1fa12c0

Change-Id: Ibade5d0264b49cc2e3a5f28af4d520ebff5b0c40
 2017-04-15 09:17:51 +00:00
Stephen Chen
45a1fa12c0 Merge "Remove ScoredNetwork.BADGING constants." into oc-dev 
am: e587591c5a

Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
 2017-04-15 09:13:41 +00:00
TreeHugger Robot
e587591c5a Merge "Remove ScoredNetwork.BADGING constants." into oc-dev 2017-04-15 09:04:35 +00:00
Kevin Chyn
404a28de05 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev am: 4ea09f5ca4 
am: 54b5b6d710

Change-Id: Ic865f205b44d3ba1b851b571a69b97c7a393a958
 2017-04-15 07:16:41 +00:00
Kevin Chyn
54b5b6d710 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 
am: 4ea09f5ca4

Change-Id: I9aa9104818078c058f5f5cefaf3e442873a072e8
 2017-04-15 07:11:00 +00:00
TreeHugger Robot
4ea09f5ca4 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 2017-04-15 07:05:48 +00:00
Tyler Gunn
d046aa9103 Merge "Expose phone account register/unregister intents." am: 24299f5b06 
am: b993a44272

Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2
 2017-04-15 06:17:18 +00:00
Tyler Gunn
b993a44272 Merge "Expose phone account register/unregister intents." 
am: 24299f5b06

Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
 2017-04-15 06:13:21 +00:00
Treehugger Robot
24299f5b06 Merge "Expose phone account register/unregister intents." 2017-04-15 06:07:27 +00:00
Jordan Liu
0ad90ba2a9 Update api for ServiceStateProvider 
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
 2017-04-14 22:16:50 -07:00
Jorim Jaggi
626eb77c16 Merge "Wallpaper color extraction API stub" into oc-dev am: 6acf7a7b45 
am: 9b24dd3186

Change-Id: Iae905316d4a489de425d0dd8da1b0cf35c559f82
 2017-04-15 05:02:07 +00:00
Tyler Gunn
27a83fe547 Expose phone account register/unregister intents. 
These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
 2017-04-15 04:57:47 +00:00
Jorim Jaggi
9b24dd3186 Merge "Wallpaper color extraction API stub" into oc-dev 
am: 6acf7a7b45

Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
 2017-04-15 04:56:51 +00:00
Jorim Jaggi
6acf7a7b45 Merge "Wallpaper color extraction API stub" into oc-dev 2017-04-15 04:52:24 +00:00
Tyler Gunn
c1dec0ab37 Merge "Expose phone account register/unregister intents." 2017-04-15 04:50:11 +00:00
Eugene Susla
1c6b5765bb Merge "API for notification listener for Companioon apps" into oc-dev am: 0d88904744 
am: 0fb1104b25

Change-Id: I33326544bd1eef9abc900ea13cb2fdf32ad06cbe
 2017-04-15 04:28:02 +00:00
Eugene Susla
0fb1104b25 Merge "API for notification listener for Companioon apps" into oc-dev 
am: 0d88904744

Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
 2017-04-15 04:22:48 +00:00
TreeHugger Robot
0d88904744 Merge "API for notification listener for Companioon apps" into oc-dev 2017-04-15 04:15:38 +00:00
Svetoslav Ganov
6359d85658 Merge "Add support for multiple fill contexts" into oc-dev am: 41200eac71 
am: 721b28f029

Change-Id: I1e3da29514943c1e7476db8bc6a1cbba46b7a116
 2017-04-15 03:37:56 +00:00
Svetoslav Ganov
721b28f029 Merge "Add support for multiple fill contexts" into oc-dev 
am: 41200eac71

Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a
 2017-04-15 03:33:02 +00:00
Svetoslav Ganov
41200eac71 Merge "Add support for multiple fill contexts" into oc-dev 2017-04-15 03:29:13 +00:00
Etan Cohen
d0703887a8 Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev am: d98f26e4f3 -s ours 
am: f9e3b532b7  -s ours

Change-Id: Ic2dcb3a90f8e241bcf43a06e785816c81a9da8b1
 2017-04-15 02:42:20 +00:00
Etan Cohen
f9e3b532b7 Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev 
am: d98f26e4f3  -s ours

Change-Id: Ic728d22ee9d7407df5437e3da0468387f5c098c2
 2017-04-15 02:32:31 +00:00
TreeHugger Robot
d98f26e4f3 Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev 
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
  Add test coverage for NetworkSpecifiers.
 2017-04-15 02:16:14 +00:00
Adrian Roos
bca5cb30a5 Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev am: 490ef3cda4 
am: 153159130f

Change-Id: Iabcf85cb191df80d1a24277dd420e3045838ded8
 2017-04-15 02:02:40 +00:00
Eugene Susla
cf00adebec API for notification listener for Companioon apps 
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I94d4116e1988db869ed445ae3fd018c50590e3f4
 2017-04-14 19:01:53 -07:00