316279 Commits

Author SHA1 Message Date
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
TreeHugger Robot
e49ad6c70a Merge "BluetoothMidi: request higher priority, for lower latency" into oc-dev 2017-04-14 23:49:18 +00:00
Makoto Onuki
25e893c7d5 Merge "Fix the wrong IMPORTANCE_ values." into oc-dev
am: 5f085792f6

Change-Id: I263f5cd22bf45a0b7f2f8599d28807e6464a5c2c
2017-04-14 23:39:03 +00:00
Svetoslav Ganov
3b3d9f8415 Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev
am: 21da54587b

Change-Id: I332d4aeeb7eb14a0b51a60382c8efedf4e1d5375
2017-04-14 23:34:22 +00:00
Roozbeh Pournader
2ad47527f8 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
am: 2a05c5edb7

Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb
2017-04-14 23:33:01 +00:00
Eugene Susla
ac4e846ccd [DO NOT MERGE] Add an opnion to use advertised name for renaming
am: 75fb821029

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

Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
2017-04-14 23:30:46 +00:00
Makoto Onuki
5f085792f6 Merge "Fix the wrong IMPORTANCE_ values." into oc-dev 2017-04-14 23:29:11 +00:00
Eugene Susla
24cf2d9d72 [DO NOT MERGE] Improve the error msg when started not for result
am: 5423b4e0a8

Change-Id: I44b112065b12b10cfd00498479380a9c5ad57be4
2017-04-14 23:23:45 +00:00
Svetoslav Ganov
21da54587b Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev 2017-04-14 23:22:31 +00:00
TreeHugger Robot
2a05c5edb7 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev 2017-04-14 23:22:12 +00:00
Eugene Susla
4df89bcb31 [DO NOT MERGE] Fix associations serialization optimization bug
There mas a missing defensive copy causing false positive detections of
"associations not changed" case, leading to xml file not being updated once
at least one record is present

Bug: 30932767
Test: Associate at least two different devices and ensure the xml has both.
Change-Id: Ic0dc615dd2b847e137555c1084c616831b4dde83
2017-04-14 23:21:44 +00:00
Eugene Susla
75fb821029 [DO NOT MERGE] Add an opnion to use advertised name for renaming
Test: Use new API, make sure renaming works
Change-Id: I9251c5db24495b8594fadce2beab3347a1aec884
2017-04-14 23:19:42 +00:00
Svetoslav Ganov
c9741d133d Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev
am: 728ce60465

Change-Id: Ic89d0c7084e56e24a358191660aeebe917df6b4b
2017-04-14 23:18:03 +00:00
Eugene Susla
200c37f413 [DO NOT MERGE] Stop scan on device chooser activity backgrounded
This effectively treats chooser activity pause event as cancel.

Bug: 30932767
Test: Install two toy apps and call associate API from both.
  Ensure foreground app always end up showing fresh data.

Change-Id: I7f5742e9878245550f678efd244bf84c427baef3
2017-04-14 23:17:04 +00:00
Amith Yamasani
461111bc3d BLE scan API using PendingIntent
This allows apps to listen for beacons, etc., without having to
run a foreground service and register a callback. They can instead
register a PendingIntent which will be fired when scan results
are available or when an error occurs.

Bug: 37254611
Test: WIP
Change-Id: I1793eee67ff0211370ed6fc38be4d95a4c5853f5
2017-04-14 16:16:42 -07:00
Eugene Susla
5423b4e0a8 [DO NOT MERGE] Improve the error msg when started not for result
This makes sure that if the association request callback IntentResult
s accidentally started not for result, the resulting exception is
metioning it explicitly.

Test: Ensure the error message when calling the IntentSender not for result
  explicitly mentions the requirement for the activity to be called for result.
Bug: 30932767

Change-Id: I950f262af43c555fb20dd5e49e935e476f24bba8
2017-04-14 23:15:12 +00:00
Svetoslav Ganov
728ce60465 Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 2017-04-14 23:11:30 +00:00
Eugene Susla
3c9aa1767c [DO NOT MERGE] Fix a bug with filtering by raw bytes
(when such filter is not provided)
See change in BluetoothDeviceFilterUtils

Bug: 30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.

Change-Id: I4397fa33dd0c48771c8a754791a171f2d0bd64eb
2017-04-14 23:10:20 +00:00
Adrian Roos
67cca7442b AOD: Prolong AOD2 after interaction, turn off AOD when prox covered
Turns off AOD 1 and 2 when the proximity sensor is covered.
Also extends the AOD2 duration when the screen is touched or
the lift gesture is triggered.

Also fixes some issues with the fingerprint unlock transition
from AOD where the doze state for the NotificationPanelView
was cleared too early.

Also hides the wallpaper while we're dozing.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Fixes: 36893539
Fixes: 36893538
Fixes: 36033906
Fixes: 37327153
Change-Id: I3fccae1515a0daf2ff99589ed78ec947687e6262
2017-04-14 22:59:26 +00:00
Dianne Hackborn
579f75c8a4 Introduce a new JobServiceEngine class.
This allows any service to interact with JobScheduler, which
should give us a lot more opportunity to do interesting stuff
in the support lib.

Test: bit CtsJobSchedulerTestCases
Change-Id: I0843e8b212a0a63a17558b837b899b90cac22805
2017-04-14 15:56:47 -07:00
TreeHugger Robot
ca1bd4b541 Merge "Add isSmallBatteryDevice flag to ActivityManager." 2017-04-14 22:42:06 +00:00
Yifan Hong
585ffd1cb3 Update for removing mount arg to VintfObject::CheckCompatibility
It is default to false.

Test: pass
Bug: 36814503

Change-Id: Ib06850d3355f54996b17cc6c2980a7d17af132e5
2017-04-14 15:41:32 -07:00
Jeff Sharkey
9a4a457622 Clear identity to handle ALLOCATE_AGGRESSIVE.
We're not actually clearing any files, only deciding how much free
space is available, so we're fine assuming the remote caller has the
permission.

Test: builds, boots
Bug: 37169076
Change-Id: I6cd42f77c43e9d2de40e2b8b937c7f2145f1b869
2017-04-14 16:29:04 -06:00
Seigo Nonaka
16caccbcd9 Merge "Fix boot loop issue on Android Wear." into oc-dev am: 5f9fde884b
am: f08388e8ea

Change-Id: I5c61dfb5166e4456f55ef79a122c8fc0b312ed86
2017-04-14 22:24:34 +00:00
Seigo Nonaka
f08388e8ea Merge "Fix boot loop issue on Android Wear." into oc-dev
am: 5f9fde884b

Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb
2017-04-14 22:20:35 +00:00
TreeHugger Robot
5f9fde884b Merge "Fix boot loop issue on Android Wear." into oc-dev 2017-04-14 22:16:22 +00:00
Philip P. Moltmann
fe48dab741 Merge "Fix some racines in AutofillManager" into oc-dev am: 2ddd69ce1a
am: ae774ec189

Change-Id: Ic035560141f16118a4fefb3bb0f65edd6bd228cc
2017-04-14 22:16:02 +00:00
Philip P. Moltmann
ae774ec189 Merge "Fix some racines in AutofillManager" into oc-dev
am: 2ddd69ce1a

Change-Id: Iec8454a36985484148b821f598446d5305c601bc
2017-04-14 22:11:06 +00:00
TreeHugger Robot
2ddd69ce1a Merge "Fix some racines in AutofillManager" into oc-dev 2017-04-14 22:04:38 +00:00
Badhri Jagan Sridharan
2d08709300 Merge "Repost USB and ADB notification when locale changes" 2017-04-14 21:58:24 +00:00
Amith Yamasani
e99757e4b1 MASTER_CLEAR action should not be public
Limit it to SystemApi, for passing intent tests

Bug: 36977779
Test: cts test
Change-Id: I716b94fc3cef43db1fafbfdad8dba0d850bec474
2017-04-14 14:41:45 -07:00
Philip P. Moltmann
44a4336027 Remove autofillMode attribute
Bug: 36171235
Test: CtsAutoFillServiceTestCases
Change-Id: I69f0e1c4fa3c68f73049726e7ae8f10d9d81bf5e
2017-04-14 14:35:14 -07:00
Android Build Merger (Role)
e3852d3302 Merge "Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7 am: f713a1960e" 2017-04-14 21:20:48 +00:00
Sudheer Shanka
bc308988bd Add new api Activity.getStartInitiatedTime.
This api will return the timestamp at which this activity start was last
initiated by the system. Implementation is wip.

Bug: 9058261
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t \
      android.app.cts.ActivityStartTimeTest

Change-Id: I396458ecefbb09108f414b95f9c0beb6d609a4e1
2017-04-14 14:19:25 -07:00