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

316227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Yohei Yukawa
03a4f5a225 Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev am: e61d56fb70 
am: 7096e0e076

Change-Id: I8138d58c3fade77ea2311faa728224d0199ae3f6
 2017-04-15 01:59:05 +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
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
Amith Yamasani
927232ebe6 Merge "BLE scan API using PendingIntent" into oc-dev am: 7859022e8e 
am: 3eca1577fe

Change-Id: I226c5a770d41e3d096658da3148a4089fa3a29f3
 2017-04-15 01:47:05 +00:00
TreeHugger Robot
e61d56fb70 Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev 2017-04-15 01:44:37 +00:00
Tyler Gunn
d9da6ce993 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.
Cherry-pick from aosp-master to resolve merge conflicts.

Test: Manual
Bug: 37106957
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
 2017-04-14 18:41:32 -07: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
Wale Ogunwale
38b05ffa3f Merge "Reduce effect on PipMenuActivity during animation" into oc-dev am: 47dea3b16d 
am: a1ba99cbb0

Change-Id: I62498300c52361aad5a81ec7bec58c2e98748347
 2017-04-15 01:34:27 +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
TreeHugger Robot
75c6800138 Merge "Null-check mNavigationBar when returning its view." 2017-04-15 01:31:12 +00: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
Dianne Hackborn
9ffd026cac Merge "Introduce a new JobServiceEngine class." into oc-dev am: aaeb512331 
am: 09d3418582

Change-Id: Id5a22d0d77f76cfeb85048dcc9e02edc5773e57d
 2017-04-15 01:27:26 +00:00
Philip P. Moltmann
64429fe511 Merge "Remove autofillMode attribute" into oc-dev am: a05f1fdd93 
am: a624433bf0

Change-Id: Idd7b711a67378287eb5a6da3374f2d84e4710a8c
 2017-04-15 01:22:16 +00:00
Jeff Sharkey
0684c076ef Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev am: dec3638c1f 
am: 5b0d782531

Change-Id: I1e5e8fb84a8489aa1cabc32572e55d6898c02592
 2017-04-15 01:19:38 +00:00
TreeHugger Robot
47dea3b16d Merge "Reduce effect on PipMenuActivity during animation" into oc-dev 2017-04-15 01:18:36 +00:00
Sudheer Shanka
c5827c0a1a Merge "Add new api Activity.getStartInitiatedTime." into oc-dev am: 2359f016e2 
am: 225e594388

Change-Id: I64b956ebf369aa19e42920d71fdcac7713ce2c32
 2017-04-15 01:18:27 +00:00
Amith Yamasani
ded55c6ed7 Merge "MASTER_CLEAR action should not be public" into oc-dev am: baf1d7036e 
am: 6c608ebafb

Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a
 2017-04-15 01:17:16 +00:00
Phil Burk
c4f4fb1b8f Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev am: e49ad6c70a 
am: 8a99d67db0

Change-Id: I97fb3470de4432a5ab408cbad4505b764b8a2b4d
 2017-04-15 01:16:05 +00:00
TreeHugger Robot
61f83f5aec Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." 2017-04-15 01:08:26 +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