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

314907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
4cc5518c80 Use vsync choreographer when moving PIP. 
am: 487737b876

Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
 2017-04-17 01:50:43 +00: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
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
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
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
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
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
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
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
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
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
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
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
Nathan Harold
661278432d Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 
am: d50a325553

Change-Id: I6d55820dc1710035fcab839f6cae809fa44f16da
 2017-04-15 01:59:13 +00:00
Adrian Roos
153159130f Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev 
am: 490ef3cda4

Change-Id: I6a808b422c23e0bd695d8422150e57ed9cf874ad
 2017-04-15 01:58:55 +00:00
Nathan Harold
d50a325553 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" 
am: 02278a5a02

Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
 2017-04-15 01:52:24 +00:00
Yohei Yukawa
7096e0e076 Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev 
am: e61d56fb70

Change-Id: If566134ba9f8ac40cf73a92745b45262681531c9
 2017-04-15 01:51:55 +00:00
Adrian Roos
490ef3cda4 Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev 2017-04-15 01:48:31 +00:00
TreeHugger Robot
e61d56fb70 Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev 2017-04-15 01:44:37 +00:00
Treehugger Robot
02278a5a02 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" 2017-04-15 01:43:00 +00:00
Amith Yamasani
3eca1577fe Merge "BLE scan API using PendingIntent" into oc-dev 
am: 7859022e8e

Change-Id: Ic694cf7dae7e7c151155787da5b079699cec93ed
 2017-04-15 01:41:29 +00:00
TreeHugger Robot
7859022e8e Merge "BLE scan API using PendingIntent" into oc-dev 2017-04-15 01:34:08 +00:00
Lucas Dupin
c40608c041 Wallpaper color extraction API stub 
Now it's possible to listen to changes on wallpaper colors by
registering a listener on WallpaperManager. It's also possible
to get the current wallpaper text color hints.

Bug: 36856508
Test: compilation
Change-Id: I5102cb7be9a4af60b85fc8913154a79dfe5c21a0
 2017-04-14 18:33:08 -07:00
Wale Ogunwale
a1ba99cbb0 Merge "Reduce effect on PipMenuActivity during animation" into oc-dev 
am: 47dea3b16d

Change-Id: I57a59e7fe55c50bb69dad7e0de3b8b11a2bb9638
 2017-04-15 01:28:03 +00:00
TreeHugger Robot
47dea3b16d Merge "Reduce effect on PipMenuActivity during animation" into oc-dev 2017-04-15 01:18:36 +00:00
Dianne Hackborn
09d3418582 Merge "Introduce a new JobServiceEngine class." into oc-dev 
am: aaeb512331

Change-Id: I68e306a970096cdd7d65b13865f70081679759ec
 2017-04-15 01:02:31 +00:00
Philip P. Moltmann
a624433bf0 Merge "Remove autofillMode attribute" into oc-dev 
am: a05f1fdd93

Change-Id: Ib5a661b27a23e7dbaa277a3d3ea1d85a4ab7ba72
 2017-04-15 00:56:44 +00:00
Dianne Hackborn
aaeb512331 Merge "Introduce a new JobServiceEngine class." into oc-dev 2017-04-15 00:55:55 +00:00
TreeHugger Robot
a05f1fdd93 Merge "Remove autofillMode attribute" into oc-dev 2017-04-15 00:50:51 +00:00
Stephen Chen
d831be95fb Remove ScoredNetwork.BADGING constants. 
Bug: 35323372
Bug: 35114358
Test: make,  runtest --path
frameworks/base/core/tests/coretests/src/android/net/ScoredNetworkTest.java

Change-Id: I9640e374abe428235d94e0407d9d21f390550d2f
 2017-04-15 00:40:58 +00:00