316317 Commits

Author SHA1 Message Date
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
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
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
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
Treehugger Robot
02278a5a02 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" 2017-04-15 01:43:00 +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
Christopher Tate
246a0e77fa Don't back up disabled apps
Bug 37150882
Test: manual

Change-Id: I9d8e34de880727325206f4d173a03f1fca4613a4
2017-04-14 18:08:23 -07: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
Svet Ganov
013efe173e Add support for multiple fill contexts
When saving data filled by the user the platform provides to
an autofill provider the state of the UI allowing the provider
to interpret this state and store relevant information.

A limitation of the current design is that the fill provider
needs to interpret the screen content twice, once handling a
fill request and once handling a save request. To address this
we are introducing a id for each fill request allowing the
autofill provider to associate arbitrary state with each fill
request and store it in the client data bundle later passed
to save.

Another limitation of the current design is that if the screen
changes dynamically while the user interacts with the app the
UI state passed on save represents a static snapshot, therefore
it is not possible to the autofill provider to determine the
context in which the data in the UI was filled. We could
keep the views and have deltas for views being removed/added
/moved/changed but this is not enough as the fill provider
needs to know not only what changed but what changed for every
fill request and in one session there could be multiple fill
requests. To address this we provide a list of fill contexts
on save each of which has the id of the corresponding fill
request. This allows the fill provider to know the exact context
in which the data was popuplated and also use its custom client
state for this fill request if desired.

This change deprecates the old APIs and the new ones delegate
to the old ones. Once the clients migrate to the new APIs we
will remove the old ones.

Test: all autofill CTS tests pass

Change-Id: Idcebcc671aa3c078a305d8c358e225274fccc588
2017-04-14 17:37:31 -07:00
Jeff Sharkey
5b0d782531 Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev
am: dec3638c1f

Change-Id: I9cc266dd67fac65859d86f77f085eb45b4e73701
2017-04-15 00:36:24 +00:00
Kevin Chyn
625a014006 Keyguard should authenticate with FP even after getting valid FP
There may be strange states where the user is already authenticated
but still on the lockscreen. The user should be able to dismiss
keyguard in that state.

Fixes: 29306222

Test: unlock phone
go back to keyguard
swipe up screen half way
touch fingerprint sensor (icon should change to unlocked)
then touch fingerprint sensor again (keyguard should be dismissed)

Test: unlock phone and go to settings -> Pixel Imprint
lock phone, unlock phone with fingerprint
touch sensor again and make sure Pixel Imprint page also responds to FP
do this test at least 10 times

Change-Id: I86acd520a06a68fab3548dd4cf6153a7833114fe
2017-04-14 17:33:14 -07:00
TreeHugger Robot
dec3638c1f Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev 2017-04-15 00:30:32 +00:00
Ray Essick
10353e3601 Rework getMetrics() api per API council
Reworking the media metrics getMetrics() calls (currently in MediaCodec,
MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction
from the API Council.

Drop the MediaMetricsSet that we had in the first round; go back
to a PersistableBundle as the return type. Moves the key definitions
from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants

Bug: 37083862
Test: ran the corresponding CTS tests
Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
2017-04-14 17:24:42 -07:00
Makoto Onuki
58105199f5 resolve merge conflicts of 25e893c7d5d3 to master
Test: build

Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f
2017-04-14 17:19:17 -07:00
Sudheer Shanka
225e594388 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev
am: 2359f016e2

Change-Id: I8a2ab94f67894736188fd62df8503dfa637ad9ed
2017-04-15 00:17:26 +00:00
Sudheer Shanka
2359f016e2 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev 2017-04-15 00:09:32 +00:00
Android Build Merger (Role)
50d55693ce Merge "Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am: 21da54587b am: 3b3d9f8415" 2017-04-15 00:02:55 +00:00
TreeHugger Robot
209abb290c Merge "Cleanup that wasn't uploaded with ag/2094132" 2017-04-15 00:02:29 +00:00
Svetoslav Ganov
dfcfee7a58 Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am: 21da54587b
am: 3b3d9f8415

Change-Id: If448d00811124f5a12d9cae166e2c81a83d13f02
2017-04-15 00:02:01 +00:00
Roozbeh Pournader
59e987e922 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev am: 2a05c5edb7
am: 2ad47527f8

Change-Id: Ib0639bc5e7b5e761d800b3e87915b59cd8523bb0
2017-04-15 00:00:36 +00:00
Eugene Susla
78784bc705 [DO NOT MERGE] Add an opnion to use advertised name for renaming am: 75fb821029
am: ac4e846ccd

Change-Id: I9296605dab1f6f0839d4e08fa4d35329aa19a454
2017-04-14 23:59:25 +00:00
Eugene Susla
4389460750 [DO NOT MERGE] Stop scan on device chooser activity backgrounded am: 200c37f413
am: c242b76a4b

Change-Id: I0bda2f7f098721c3adf13adaa9016d02244a30b3
2017-04-14 23:58:16 +00:00
Eugene Susla
52eb43a513 [DO NOT MERGE] Improve the error msg when started not for result am: 5423b4e0a8
am: 24cf2d9d72

Change-Id: I8b55e20253230f838555162a9d57c4f5f6ae56b4
2017-04-14 23:57:06 +00:00
Amith Yamasani
6c608ebafb Merge "MASTER_CLEAR action should not be public" into oc-dev
am: baf1d7036e

Change-Id: I361e8369ec16da7d032680530223463228921616
2017-04-14 23:57:05 +00:00
Svetoslav Ganov
e814398c77 Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev am: 728ce60465
am: c9741d133d  -s ours

Change-Id: I62123b943a59fb73302f2a094cd8133da15d5060
2017-04-14 23:55:56 +00:00
Phil Burk
8a99d67db0 Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev
am: e49ad6c70a

Change-Id: Idcece5b34d81cdeb43eb9196d7d29c3023605782
2017-04-14 23:55:42 +00:00
Philip Quinn
c0c18cafef Null-check mNavigationBar when returning its view.
Without this check there's no way to avoid a NullPointerException if
getNavigationBarView() is called before the navigation bar fragment is
created.

Bug: 36852229
Bug: 37330416
Bug: 37331698
Fixes: 36508501
Test: make -j; cannot reproduce bugs.
Change-Id: Ia3c9b4eaea26b78cdc39a446918047eb1f440d70
2017-04-14 16:54:42 -07:00
TreeHugger Robot
baf1d7036e Merge "MASTER_CLEAR action should not be public" into oc-dev 2017-04-14 23:50:26 +00:00