OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdds generic intent Instant App resolution
Patrick Baumann [Mon, 8 Jan 2018 19:23:38 +0000 (11:23 -0800)]
Adds generic intent Instant App resolution

Bug: 63117034
Change-Id: Ie3818e913e8e1077f60434a626bc606c0b5015ab
Test: Manual using test app at google_experimental/users/patb/InstantAppsInP
Test: atest android.appsecurity.cts.EphemeralTest passes after modification

6 years agoMerge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71 am: 38cbc885d1
Jason Monk [Mon, 29 Jan 2018 16:15:42 +0000 (16:15 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71 am: 38cbc885d1
am: 0b922f2dd8

Change-Id: Idae1cdbac391e00e4e2f623017b343ec9de9cb44

6 years agoMerge "Control hidden API toast with a system property" am: 13020490be am: a9b3f91828
David Brazdil [Mon, 29 Jan 2018 16:07:23 +0000 (16:07 +0000)]
Merge "Control hidden API toast with a system property" am: 13020490be am: a9b3f91828
am: 1e1c4fc802

Change-Id: I0b2d898dbdac8ed6ac8995bab521b62adb5d0f2e

6 years agoMerge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71
Jason Monk [Mon, 29 Jan 2018 16:06:51 +0000 (16:06 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71
am: 38cbc885d1

Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a

6 years agoMerge "Control hidden API toast with a system property" am: 13020490be
David Brazdil [Mon, 29 Jan 2018 15:59:49 +0000 (15:59 +0000)]
Merge "Control hidden API toast with a system property" am: 13020490be
am: a9b3f91828

Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157

6 years agoMerge "Fix nav keys being tiny on sw600dp devices"
Jason Monk [Mon, 29 Jan 2018 15:56:06 +0000 (15:56 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
am: a20239bf71

Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6

6 years agoMerge "Control hidden API toast with a system property"
David Brazdil [Mon, 29 Jan 2018 15:52:46 +0000 (15:52 +0000)]
Merge "Control hidden API toast with a system property"
am: 13020490be

Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d

6 years agoMerge "Alarms and Media visibly muted in PriorityOnly dnd"
TreeHugger Robot [Mon, 29 Jan 2018 15:45:39 +0000 (15:45 +0000)]
Merge "Alarms and Media visibly muted in PriorityOnly dnd"

6 years agoMerge "MediaSession2/Controller2: Add playlist support"
TreeHugger Robot [Mon, 29 Jan 2018 15:43:19 +0000 (15:43 +0000)]
Merge "MediaSession2/Controller2: Add playlist support"

6 years agoMerge "Remove return value in clearApplicationUserData"
TreeHugger Robot [Mon, 29 Jan 2018 15:41:28 +0000 (15:41 +0000)]
Merge "Remove return value in clearApplicationUserData"

6 years agoMerge changes from topics "sessiontoken2_simpl", "move_binder2", "mediaitem2_updatabl...
TreeHugger Robot [Mon, 29 Jan 2018 15:29:33 +0000 (15:29 +0000)]
Merge changes from topics "sessiontoken2_simpl", "move_binder2", "mediaitem2_updatable", "session2_sendcustomcommand"

* changes:
  MediaSession2: Simplify constructor of SessionToken2
  MediaSession2: Move binder interfaces into the updatable
  MediaSession2: Move MediaItem2 to updatable
  MediaSession2: Implements sendCustomCommand()

6 years agoMerge "readCertsListXml: fix IndexOutofBoundsException and erroneous skip."
TreeHugger Robot [Mon, 29 Jan 2018 15:25:08 +0000 (15:25 +0000)]
Merge "readCertsListXml: fix IndexOutofBoundsException and erroneous skip."

6 years agoMerge "Do not propagate parent bound changes from task as onResize."
Bryce Lee [Mon, 29 Jan 2018 15:24:58 +0000 (15:24 +0000)]
Merge "Do not propagate parent bound changes from task as onResize."

6 years agoMerge "Enable IP callback for Network Watchlist"
Ricky Wai [Mon, 29 Jan 2018 15:24:29 +0000 (15:24 +0000)]
Merge "Enable IP callback for Network Watchlist"

6 years agoMerge "Fix nav keys being tiny on sw600dp devices"
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"

6 years agoMerge "Control hidden API toast with a system property"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"

6 years agoMediaSession2/Controller2: Add playlist support
Hyundo Moon [Mon, 29 Jan 2018 08:06:03 +0000 (17:06 +0900)]
MediaSession2/Controller2: Add playlist support

This CL does the following:
 - Removes PlaylistParams argument from all playlist related methods.
   (i.e. setPlaylist(List, PlaylistParams) becomes setPlaylist(List))
 - Adds methods (to/fromBundle, to/fromBundleList) into MediaItem2.

Bug: 72537268
Test: Passed MediaSession2Test
Change-Id: I48ef69ad2728fb7de7efab10f4e077aec552dd0b

6 years agoMediaSession2: Simplify constructor of SessionToken2
Jaewan Kim [Mon, 29 Jan 2018 12:49:41 +0000 (21:49 +0900)]
MediaSession2: Simplify constructor of SessionToken2

Test: Run all MediaComponents tests once
Change-Id: Ic99d5916d354815a57fe37d04dfeb625c493076d

6 years agoMediaSession2: Move binder interfaces into the updatable
Jaewan Kim [Mon, 29 Jan 2018 12:37:20 +0000 (21:37 +0900)]
MediaSession2: Move binder interfaces into the updatable

Test: Run all MediaComponents tests once
Change-Id: I29a7aa9d649ea212ad4728ebabff40ec0d47ecb1

6 years agoMediaSession2: Move MediaItem2 to updatable
Jaewan Kim [Mon, 29 Jan 2018 11:27:18 +0000 (20:27 +0900)]
MediaSession2: Move MediaItem2 to updatable

Bug: 72627815
Test: Run all MediaComponents test once
Change-Id: Iced94541233145b928e480f3d062a64cc0814a26

6 years agoMediaSession2: Implements sendCustomCommand()
Jaewan Kim [Mon, 29 Jan 2018 10:36:30 +0000 (19:36 +0900)]
MediaSession2: Implements sendCustomCommand()

Bug: 72543316
Test: Run all MediaComponents tests once
Change-Id: Iad4fff6d6d41fb39f632735244cc7ecbec93fa0f

6 years agoMerge "[Magnifier-17] Decrease magnifier width"
Mihai Popa [Mon, 29 Jan 2018 13:33:24 +0000 (13:33 +0000)]
Merge "[Magnifier-17] Decrease magnifier width"

6 years agoMerge "WorkSource: Mark methods required by GMS as @SystemApi."
Narayan Kamath [Mon, 29 Jan 2018 13:27:05 +0000 (13:27 +0000)]
Merge "WorkSource: Mark methods required by GMS as @SystemApi."

6 years agoMerge "Javadoc For DA Deprecation"
Eric Sandness [Mon, 29 Jan 2018 12:34:28 +0000 (12:34 +0000)]
Merge "Javadoc For DA Deprecation"

6 years agoMerge "[Magnifier-16] Clamp to surface against distortion"
Mihai Popa [Mon, 29 Jan 2018 12:14:25 +0000 (12:14 +0000)]
Merge "[Magnifier-16] Clamp to surface against distortion"

6 years ago[Magnifier-16] Clamp to surface against distortion
Mihai Popa [Thu, 25 Jan 2018 19:26:30 +0000 (19:26 +0000)]
[Magnifier-16] Clamp to surface against distortion

Previously, we were only making sure that the magnified content belongs
to the view the magnifier is attached to. However, when the view was
laid out partially outside the screen, we would pixel copy from outside
the surface the view is attached to. This would lead to the user seeing
a distorted content in the magnifier, in cases when the magnified view
lies outside the screen. This CL addresses this issue, by clamping the
pixel copy coordinates inside the surface we copy the magnifier content
from.

Bug: 72039853
Bug: 63531115
Test: bit CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Iddab05c98b615259938e0d3a3320b98b3b13b246

6 years ago[Magnifier-17] Decrease magnifier width
Mihai Popa [Fri, 26 Jan 2018 20:01:03 +0000 (20:01 +0000)]
[Magnifier-17] Decrease magnifier width

The CL decreases the magnifier width to 100dp, following the UX
feedback.

Bug: 67292315
Bug: 63531115
Test: manual testing
Change-Id: I783f35686e8ebe7401dc07c86b975f841cef0e29

6 years agoMerge "LogoutAction should store current user id before swithcing"
TreeHugger Robot [Mon, 29 Jan 2018 12:03:24 +0000 (12:03 +0000)]
Merge "LogoutAction should store current user id before swithcing"

6 years agoMerge "Remove unnecessary <uses-library> for android.test.runner"
TreeHugger Robot [Mon, 29 Jan 2018 11:40:19 +0000 (11:40 +0000)]
Merge "Remove unnecessary <uses-library> for android.test.runner"

6 years agoMerge "Do not close InputStream from InputStreamSource"
Leon Scroggins [Mon, 29 Jan 2018 11:24:40 +0000 (11:24 +0000)]
Merge "Do not close InputStream from InputStreamSource"

6 years agoMerge "Refactor the PackageBackwardCompatibilityTest"
TreeHugger Robot [Mon, 29 Jan 2018 11:24:36 +0000 (11:24 +0000)]
Merge "Refactor the PackageBackwardCompatibilityTest"

6 years agoControl hidden API toast with a system property
David Brazdil [Fri, 26 Jan 2018 12:23:15 +0000 (12:23 +0000)]
Control hidden API toast with a system property

CL Id0a4200f912ac3303026cb26b6d8974c47332828 sets a system property
"ro.art.hiddenapi.warning" for non-release, non-user builds. This
patch reads that flag and unless the flag is set, will only ever show
the warning message if the app is debuggable.

Test: manual
Bug: 64382372
Change-Id: I9b552792779589a7a91818a82d5c86141fc0a30b

6 years agoMerge "MediaController2: Implement get/setPlaylistParams"
TreeHugger Robot [Mon, 29 Jan 2018 09:53:07 +0000 (09:53 +0000)]
Merge "MediaController2: Implement get/setPlaylistParams"

6 years agoMediaController2: Implement get/setPlaylistParams
Hyundo Moon [Mon, 29 Jan 2018 05:04:23 +0000 (14:04 +0900)]
MediaController2: Implement get/setPlaylistParams

Bug: 72537520
Test: Passed MediaController2Test
Change-Id: If9b3107084f3f4b063967f079bf229bb43b95cbd

6 years agoMerge changes from topic "session2_playlist_add_remove"
TreeHugger Robot [Mon, 29 Jan 2018 07:16:34 +0000 (07:16 +0000)]
Merge changes from topic "session2_playlist_add_remove"

* changes:
  MediaSession2: Add listeners for change in session token
  MediaSession2: Add from add/remove an item from playlist

6 years agoMerge "VideoView2: Adds Executor paramter to setFooListener methods"
Insun Kang [Mon, 29 Jan 2018 05:10:12 +0000 (05:10 +0000)]
Merge "VideoView2: Adds Executor paramter to setFooListener methods"

6 years agoMerge "VideoView2: MediaRouter integration with MediaSession"
TreeHugger Robot [Mon, 29 Jan 2018 04:39:03 +0000 (04:39 +0000)]
Merge "VideoView2: MediaRouter integration with MediaSession"

6 years agoMerge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev am: 16a77c54ef
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:18:38 +0000 (04:18 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev am: 16a77c54ef
am: 223ba4c536

Change-Id: I431ffb4177174cba7258a3a6ad30cfbab130f269

6 years agoMerge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:11:43 +0000 (04:11 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
am: 16a77c54ef

Change-Id: Ifb88d7364a377092509bb9a93def65ccca7dcf41

6 years agoMerge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:04:09 +0000 (04:04 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev

6 years agoVideoView2: Adds Executor paramter to setFooListener methods
Insun Kang [Fri, 26 Jan 2018 16:17:49 +0000 (01:17 +0900)]
VideoView2: Adds Executor paramter to setFooListener methods

- Added Executor parameter to setFooListeners
- Removed setFullScreen()
- Renamed OnFullScreenChangedListener --> OnFullScreenRequestListener

Test: build
Change-Id: I1822876ecf55566182281a76ea7919d7c0112146

6 years agoMediaSession2: Add listeners for change in session token
Jaewan Kim [Mon, 29 Jan 2018 02:57:04 +0000 (11:57 +0900)]
MediaSession2: Add listeners for change in session token

Test: Run all MediaComponents tests once
Change-Id: Ic46ad9e4e4c9e1ce43b3dbad904eae7fc30d52a0

6 years agoMerge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1...
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:47:50 +0000 (02:47 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev am: 1299d4b0a9
am: d5a62bebc3

Change-Id: Ie138a98a87f9f4fb895d2b9f834d43ac04866b86

6 years agoMerge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:39:30 +0000 (02:39 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
am: 1299d4b0a9

Change-Id: Ib2911651950048305b00df5f26ca5656e205bcee

6 years agoMerge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:27:48 +0000 (02:27 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev

6 years agoVideoView2: MediaRouter integration with MediaSession
Sungsoo Lim [Thu, 25 Jan 2018 05:12:35 +0000 (14:12 +0900)]
VideoView2: MediaRouter integration with MediaSession

Bug: 72526814
Test: build
Change-Id: Iace25522b433152022bdd3458b6791a89618464b

6 years agoDo not close InputStream from InputStreamSource
Leon Scroggins III [Tue, 23 Jan 2018 16:38:23 +0000 (11:38 -0500)]
Do not close InputStream from InputStreamSource

Test: I28f82285c0341aff7192eb0157e0de4b97cda577

This is called by public methods that pass along an InputStream. As
such, it is possible that the client was planning to continue reading
from the InputStream, so do not close it.

Change-Id: Iaa53c44d578c1311315616c8fd931bed40290a92

6 years agoMerge "Comment more on component callback order for N+ OS"
TreeHugger Robot [Mon, 29 Jan 2018 00:50:17 +0000 (00:50 +0000)]
Merge "Comment more on component callback order for N+ OS"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 28 Jan 2018 19:38:19 +0000 (19:38 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 28 Jan 2018 19:15:33 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 28 Jan 2018 19:11:25 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "WifiManager: return errors for WPS API calls"
Rebecca Silberstein [Sun, 28 Jan 2018 19:08:24 +0000 (19:08 +0000)]
Merge "WifiManager: return errors for WPS API calls"

6 years agoMerge "WifiManager: update documentation on factoryReset"
Rebecca Silberstein [Sun, 28 Jan 2018 19:07:41 +0000 (19:07 +0000)]
Merge "WifiManager: update documentation on factoryReset"

6 years agoMerge "Add freeze period support in SystemUpdatePolicy"
TreeHugger Robot [Sun, 28 Jan 2018 16:11:37 +0000 (16:11 +0000)]
Merge "Add freeze period support in SystemUpdatePolicy"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 28 Jan 2018 15:35:54 +0000 (07:35 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib019cc7a7cd6554b73757af48ddca67efc4d60e3
Auto-generated-cl: translation import

6 years agoMediaSession2: Add from add/remove an item from playlist
Jaewan Kim [Sun, 28 Jan 2018 14:16:43 +0000 (23:16 +0900)]
MediaSession2: Add from add/remove an item from playlist

Bug: 72527248, Bug: 72527150
Test: Run all MediaComponents test once
Change-Id: Ie75e1a7fa3cd3bea786445aab827afc62cf189b5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 28 Jan 2018 13:14:29 +0000 (05:14 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib683db19ff4cee271db11bdb36956cbec7102804
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 28 Jan 2018 10:58:45 +0000 (02:58 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iac2b17e1de14b34dd61a7dd83c411d154032777a
Auto-generated-cl: translation import

6 years agoWifiManager: return errors for WPS API calls
Rebecca Silberstein [Sat, 20 Jan 2018 01:45:26 +0000 (17:45 -0800)]
WifiManager: return errors for WPS API calls

WPS support in Client mode is deprecated.  Trigger onFailed callbacks
for WPS operations. Added unit tests to check for error callbacks.

Bug: 72168432
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I442afd75b6b3ed3d43488cc2185274e9584352d1

6 years agoWifiManager: update documentation on factoryReset
Rebecca Silberstein [Sat, 20 Jan 2018 01:16:26 +0000 (17:16 -0800)]
WifiManager: update documentation on factoryReset

Update the documentation on factoryReset to reflect what is actually
done by WifiServiceImpl (removed saved wifi networks).

Bug: 68030936
Test: check documentation
Change-Id: I6958ffb94dec8d86f6a53d4c44504ce16c8a3012

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1b9eecab0 -s ours
Bill Yi [Sun, 28 Jan 2018 07:01:49 +0000 (07:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1b9eecab0  -s ours
am: d99cb52b17  -s ours

Change-Id: I276d2d4cc8f8c2b52b32dfd3c8d1db385c1f0639

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 28 Jan 2018 06:56:41 +0000 (06:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: a1b9eecab0  -s ours

Change-Id: Ibf30adce3835b1023b40b814fe5dfb46dfd04d06

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 28 Jan 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Small fixes for TextClassifierImpl"
TreeHugger Robot [Sat, 27 Jan 2018 23:39:52 +0000 (23:39 +0000)]
Merge "Small fixes for TextClassifierImpl"

6 years agoMerge "Add throwIfParentInstance check to setMandatoryBackupTransport."
TreeHugger Robot [Sat, 27 Jan 2018 18:09:33 +0000 (18:09 +0000)]
Merge "Add throwIfParentInstance check to setMandatoryBackupTransport."

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ac3264742d -s ours
Bill Yi [Sat, 27 Jan 2018 17:47:18 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ac3264742d  -s ours
am: f5a0d05654  -s ours

Change-Id: Idb07969aace9ee398cd3741de5be064828a66306

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 27 Jan 2018 17:39:47 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: ac3264742d  -s ours

Change-Id: I7c30321b70de8f0f35057356b17673a15f6b2b09

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 27 Jan 2018 17:32:17 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 27 Jan 2018 16:51:31 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Rename RefactoredBackupManagerService to BackupManagerService"
TreeHugger Robot [Sat, 27 Jan 2018 13:49:19 +0000 (13:49 +0000)]
Merge "Rename RefactoredBackupManagerService to BackupManagerService"

6 years agoMerge "Clear pending brightness setting when it's redundant."
TreeHugger Robot [Sat, 27 Jan 2018 13:34:19 +0000 (13:34 +0000)]
Merge "Clear pending brightness setting when it's redundant."

6 years agoMerge "Reset brightness adjustment when user sets brightness directly."
TreeHugger Robot [Sat, 27 Jan 2018 10:36:22 +0000 (10:36 +0000)]
Merge "Reset brightness adjustment when user sets brightness directly."

6 years agoMerge "Use correct brightness when manual brightness is enabled."
TreeHugger Robot [Sat, 27 Jan 2018 10:25:27 +0000 (10:25 +0000)]
Merge "Use correct brightness when manual brightness is enabled."

6 years agoMerge "Refine atom definitions for memory metrics."
TreeHugger Robot [Sat, 27 Jan 2018 09:57:14 +0000 (09:57 +0000)]
Merge "Refine atom definitions for memory metrics."

6 years agoMerge "Keyguard slice font and separator"
TreeHugger Robot [Sat, 27 Jan 2018 09:27:19 +0000 (09:27 +0000)]
Merge "Keyguard slice font and separator"

6 years agoMerge "Config for device specific AudioService."
TreeHugger Robot [Sat, 27 Jan 2018 09:11:22 +0000 (09:11 +0000)]
Merge "Config for device specific AudioService."

6 years agoMerge "Add android.test.legacy.jar to SDK build"
TreeHugger Robot [Sat, 27 Jan 2018 09:04:23 +0000 (09:04 +0000)]
Merge "Add android.test.legacy.jar to SDK build"

6 years agoMerge changes from topics "sessionplayer2", "mediasession2_audio_api", "session2_play...
TreeHugger Robot [Sat, 27 Jan 2018 08:05:20 +0000 (08:05 +0000)]
Merge changes from topics "sessionplayer2", "mediasession2_audio_api", "session2_playbacklistener", "session2_timing"

* changes:
  MediaSession2: Initial commit of SessionPlayer2
  MediaSession2 API set for audio focus handling
  MediaSession2: Add/remove playback listeners
  MediaSession2: Fix timing issue

6 years agoMerge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664...
Erik Kline [Sat, 27 Jan 2018 07:53:11 +0000 (07:53 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664 am: d98c6b91a5
am: 5e6b525f32

Change-Id: Icff5c0ca59fc04377bd6beeff09e65b0d2170f17

6 years agoMerge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664
Erik Kline [Sat, 27 Jan 2018 07:43:33 +0000 (07:43 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664
am: d98c6b91a5

Change-Id: I653951f1aac8113ecfe373b0e69a455ccd46796c

6 years agoMerge "Add Tethering's UID to the legacy type NetworkCapabilities"
Erik Kline [Sat, 27 Jan 2018 07:35:21 +0000 (07:35 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
am: 2aed62d664

Change-Id: I3d93baafab1bc9be4bee6246cc3e04682363a690

6 years agoMerge "Add Tethering's UID to the legacy type NetworkCapabilities"
Treehugger Robot [Sat, 27 Jan 2018 07:20:10 +0000 (07:20 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"

6 years agoRefine atom definitions for memory metrics.
Rajeev Kumar [Fri, 26 Jan 2018 03:03:09 +0000 (19:03 -0800)]
Refine atom definitions for memory metrics.

Defines following atoms:
 -- AppStartMemoryStateChanged
 -- ProcessMemoryState
 -- LmkStateChanged
 -- LmkProcessKilled

These changes are based on the discussion with WestWorld team.
See: go/android-p-memory-metrics
Bug: 72177881
Test: Manual

Change-Id: I884f23f3d7627440af5faa25f9479ba0d8763bec

6 years agoreadCertsListXml: fix IndexOutofBoundsException and erroneous skip.
Dan Cashman [Fri, 26 Jan 2018 22:25:33 +0000 (14:25 -0800)]
readCertsListXml: fix IndexOutofBoundsException and erroneous skip.

When reading pastCerts, flags are read along with the hex-encoded
certificate, but the index into the array is updated after reading
the cert, before reading the flags.  This leads to an
ArrayIndexOutOfBoundsException.  Change the iterator update to be
after both arrays have been processed.

Also move the skipCurrentTag call to the <cert /> parsing section.
The pastSigs tag has nested elements so by the time it has finished
processing, it is already at the pastSigs end-tag, which causes the
parser to continue past the <sigs> entry erroneously.

Bug: 64686581
Test: Builds, boots with app with key rotation history.
Change-Id: I3965ffb5f4306eaddc0a3a959ef0f9674068f9d2

6 years agoMerge "Add Bluetooth atoms"
TreeHugger Robot [Sat, 27 Jan 2018 04:57:19 +0000 (04:57 +0000)]
Merge "Add Bluetooth atoms"

6 years agoMerge "Move location-related code into client library"
Lifu Tang [Sat, 27 Jan 2018 04:47:53 +0000 (04:47 +0000)]
Merge "Move location-related code into client library"

6 years agoMerge "[Magnifier - 15] Fix magnifier window positioning"
TreeHugger Robot [Sat, 27 Jan 2018 04:08:32 +0000 (04:08 +0000)]
Merge "[Magnifier - 15] Fix magnifier window positioning"

6 years agoMerge "Removes the SysUi hook for car VolumeController"
TreeHugger Robot [Sat, 27 Jan 2018 03:51:29 +0000 (03:51 +0000)]
Merge "Removes the SysUi hook for car VolumeController"

6 years agoMerge "Added nullable callback support" am: 35520445be am: 19f9299af6
Jack Yu [Sat, 27 Jan 2018 03:51:00 +0000 (03:51 +0000)]
Merge "Added nullable callback support" am: 35520445be am: 19f9299af6
am: 0659e60b98

Change-Id: I289b8cbb5bceab13c7684a2509e79e77828c07fd

6 years agoMerge "Revert "Move A11y events throttling away from View(RootImpl)""
TreeHugger Robot [Sat, 27 Jan 2018 03:45:39 +0000 (03:45 +0000)]
Merge "Revert "Move A11y events throttling away from View(RootImpl)""

6 years agoMerge "Added nullable callback support" am: 35520445be
Jack Yu [Sat, 27 Jan 2018 03:42:06 +0000 (03:42 +0000)]
Merge "Added nullable callback support" am: 35520445be
am: 19f9299af6

Change-Id: I1701893d61b9e459b0f22e0165d03f5efadfd56e

6 years agoMerge "Added nullable callback support"
Jack Yu [Sat, 27 Jan 2018 03:35:50 +0000 (03:35 +0000)]
Merge "Added nullable callback support"
am: 35520445be

Change-Id: Ic34fd279a8a125e4ab7fe634dbb38479860932c2

6 years agoMerge "Added nullable callback support"
Treehugger Robot [Sat, 27 Jan 2018 03:24:52 +0000 (03:24 +0000)]
Merge "Added nullable callback support"

6 years agoMerge "Add loging for application key decryption failures as well"
TreeHugger Robot [Sat, 27 Jan 2018 02:39:32 +0000 (02:39 +0000)]
Merge "Add loging for application key decryption failures as well"

6 years agoMerge "Clean up the procstats dump enums and change component to use message."
TreeHugger Robot [Sat, 27 Jan 2018 02:33:21 +0000 (02:33 +0000)]
Merge "Clean up the procstats dump enums and change component to use message."

6 years agoMerge "Document Vulkan 1.1 requirements for FEATURE_VULKAN_HARDWARE_VERSION"
TreeHugger Robot [Sat, 27 Jan 2018 02:31:28 +0000 (02:31 +0000)]
Merge "Document Vulkan 1.1 requirements for FEATURE_VULKAN_HARDWARE_VERSION"

6 years agoMerge "Add UID and Service for Secure Element Application" am: b8b7589531 am: 8ee3204c58
Ruchi Kandoi [Sat, 27 Jan 2018 02:08:38 +0000 (02:08 +0000)]
Merge "Add UID and Service for Secure Element Application" am: b8b7589531 am: 8ee3204c58
am: 2b894394a5  -s ours

Change-Id: Ic0681499e0690883dedecaa2e80269f1412d8e94

6 years agoMerge "Add UID and Service for Secure Element Application" am: b8b7589531
Ruchi Kandoi [Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)]
Merge "Add UID and Service for Secure Element Application" am: b8b7589531
am: 8ee3204c58

Change-Id: I7c74f21e014fb7eb772e2d86cc278fd774ffb8c9

6 years agoMerge "Add UID and Service for Secure Element Application"
Ruchi Kandoi [Sat, 27 Jan 2018 01:52:33 +0000 (01:52 +0000)]
Merge "Add UID and Service for Secure Element Application"
am: b8b7589531

Change-Id: Ib66be1532dd440b1161e6d2d727243fc6b9e614f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 27 Jan 2018 01:50:20 +0000 (17:50 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7539ffdd87c19fc7dfd694dacd78f62fbec10397