OSDN Git Service

android-x86/frameworks-base.git
6 years agoCouple fixes for M11nGestureHandler
Eugene Susla [Wed, 14 Feb 2018 20:59:29 +0000 (12:59 -0800)]
Couple fixes for M11nGestureHandler

1. Added missing defensive copy for a MotionEvent that is posted
asynchronously with delay, and thus might get recycled
2. Fixed transitioning to viewport dragging on 3tap/shortcut+swipe

Test: manually ensure the fix is working
Bug: 73359125
Change-Id: Iae8cd3a83512ee363abe9f0b5702287d7616c092

6 years agoMerge "Make ambient brightness day stats a system API"
TreeHugger Robot [Fri, 2 Feb 2018 00:18:38 +0000 (00:18 +0000)]
Merge "Make ambient brightness day stats a system API"

6 years agoMerge "Add command to clear puller cache"
TreeHugger Robot [Thu, 1 Feb 2018 23:58:36 +0000 (23:58 +0000)]
Merge "Add command to clear puller cache"

6 years agoMerge "[RTT] Route legacy RTT API on top of new RTT API"
Etan Cohen [Thu, 1 Feb 2018 23:42:38 +0000 (23:42 +0000)]
Merge "[RTT] Route legacy RTT API on top of new RTT API"

6 years agoMerge "Switch order of onSaveInstanceState and onStop"
TreeHugger Robot [Thu, 1 Feb 2018 23:26:21 +0000 (23:26 +0000)]
Merge "Switch order of onSaveInstanceState and onStop"

6 years agoMerge "Ensure keyguard is considered unlocked on devices that disable it."
Leif Wilden [Thu, 1 Feb 2018 23:23:12 +0000 (23:23 +0000)]
Merge "Ensure keyguard is considered unlocked on devices that disable it."

6 years agoMerge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am: ddd440b...
David Srbecky [Thu, 1 Feb 2018 23:15:22 +0000 (23:15 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am: ddd440b8a2 am: 8df431a8ef
am: 2eaaf25218

Change-Id: Iffc4920eacc01df241ab770bb2805f2b6fc79dce

6 years agoMerge "MediaControlView2: Remove getProvider()"
Sungsoo Lim [Thu, 1 Feb 2018 22:57:35 +0000 (22:57 +0000)]
Merge "MediaControlView2: Remove getProvider()"

6 years agoMerge "Remove clipping from QSContainerImpl"
TreeHugger Robot [Thu, 1 Feb 2018 22:49:43 +0000 (22:49 +0000)]
Merge "Remove clipping from QSContainerImpl"

6 years agoMerge "Stop supporting broken font fallback"
TreeHugger Robot [Thu, 1 Feb 2018 22:44:30 +0000 (22:44 +0000)]
Merge "Stop supporting broken font fallback"

6 years agoMerge "Atom: Remaining and full battery capacity"
TreeHugger Robot [Thu, 1 Feb 2018 22:32:06 +0000 (22:32 +0000)]
Merge "Atom: Remaining and full battery capacity"

6 years agoMerge "Add AudioFormat.ENCODING_E_AC3_JOC"
TreeHugger Robot [Thu, 1 Feb 2018 22:03:22 +0000 (22:03 +0000)]
Merge "Add AudioFormat.ENCODING_E_AC3_JOC"

6 years agoMerge "Update argument of Layout methods."
TreeHugger Robot [Thu, 1 Feb 2018 21:40:03 +0000 (21:40 +0000)]
Merge "Update argument of Layout methods."

6 years agoMerge "Do not return stacks to AM that are marked for deferred removal."
Bryce Lee [Thu, 1 Feb 2018 21:32:28 +0000 (21:32 +0000)]
Merge "Do not return stacks to AM that are marked for deferred removal."

6 years agoAdd command to clear puller cache
Chenjie Yu [Thu, 1 Feb 2018 21:19:35 +0000 (13:19 -0800)]
Add command to clear puller cache

Test: manual test
Change-Id: Id1fa48b5a6f2200d22f4a746763f65d0c8d65f72

6 years agoMerge "Revert "Uses back and home button for screen pinning when recents is invisible""
TreeHugger Robot [Thu, 1 Feb 2018 21:14:02 +0000 (21:14 +0000)]
Merge "Revert "Uses back and home button for screen pinning when recents is invisible""

6 years agoMerge changes Iac97c342,I52518d52
Jeff Sharkey [Thu, 1 Feb 2018 21:08:52 +0000 (21:08 +0000)]
Merge changes Iac97c342,I52518d52

* changes:
  Enable sendfile() and splice() optimizations.
  Use sendfile() and splice() to speed up copying.

6 years agoMerge "Fixes quickstep swipe up animation being stuck"
TreeHugger Robot [Thu, 1 Feb 2018 20:55:39 +0000 (20:55 +0000)]
Merge "Fixes quickstep swipe up animation being stuck"

6 years agoMerge "Delete alert window notification channel when no longer used"
TreeHugger Robot [Thu, 1 Feb 2018 20:46:58 +0000 (20:46 +0000)]
Merge "Delete alert window notification channel when no longer used"

6 years agoMerge "Add tron counter for battery % too"
TreeHugger Robot [Thu, 1 Feb 2018 20:45:44 +0000 (20:45 +0000)]
Merge "Add tron counter for battery % too"

6 years agoMerge "Remove unused methods from LocationManagerService"
TreeHugger Robot [Thu, 1 Feb 2018 20:39:32 +0000 (20:39 +0000)]
Merge "Remove unused methods from LocationManagerService"

6 years agoMerge "Use statsd constants instead of literals"
TreeHugger Robot [Thu, 1 Feb 2018 20:37:29 +0000 (20:37 +0000)]
Merge "Use statsd constants instead of literals"

6 years agoMerge "Clear slice access grants on package clear/remove"
Jason Monk [Thu, 1 Feb 2018 20:25:27 +0000 (20:25 +0000)]
Merge "Clear slice access grants on package clear/remove"

6 years agoMerge "Fixes for animationEnd in AnimatedImageDrawable"
TreeHugger Robot [Thu, 1 Feb 2018 20:06:25 +0000 (20:06 +0000)]
Merge "Fixes for animationEnd in AnimatedImageDrawable"

6 years agoMerge "Fix flicker with remote animations"
TreeHugger Robot [Thu, 1 Feb 2018 20:03:54 +0000 (20:03 +0000)]
Merge "Fix flicker with remote animations"

6 years agoMerge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am: ddd440b8a2
David Srbecky [Thu, 1 Feb 2018 19:25:40 +0000 (19:25 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am: ddd440b8a2
am: 8df431a8ef

Change-Id: Ib2c08bb7bcf5d85c15db9ec16eca1ae9c7930eb6

6 years agoDo not return stacks to AM that are marked for deferred removal.
Bryce Lee [Wed, 31 Jan 2018 22:42:15 +0000 (14:42 -0800)]
Do not return stacks to AM that are marked for deferred removal.

When the Activity Manager informs the Window Manager that a stack has
been removed, it can opt to hold onto the stack (such as when an
animation is in progress). This can lead to inconsistencies where the
Window Manager can report a stack back to the Activity Manager that
has since been removed.

This changelist addresses one such call point in
WindowManagerService#setNewDisplayOverrideConfiguration. Deferred
removed displays are now filtered out of the returned list.

Change-Id: I5f7aad9296cec8bd56e933a71553f9cd40579378
Fixes: 71548119
Test: atest FrameworksServicesTests:com.android.server.wm.RootWindowContainerTests

6 years agoMerge "Add icon tintable flag to suggestion."
TreeHugger Robot [Thu, 1 Feb 2018 19:12:35 +0000 (19:12 +0000)]
Merge "Add icon tintable flag to suggestion."

6 years agoRemove unused methods from LocationManagerService
Lifu Tang [Thu, 1 Feb 2018 02:01:54 +0000 (18:01 -0800)]
Remove unused methods from LocationManagerService

Test: Built and Manually tested
Change-Id: I7e13d51864d86054eb9394704927dc4d449c0b13

6 years agoEnsure keyguard is considered unlocked on devices that disable it.
Leif Hendrik Wilden [Thu, 1 Feb 2018 18:54:15 +0000 (10:54 -0800)]
Ensure keyguard is considered unlocked on devices that disable it.

The original fix was rolled back because it broke restricted mode on ATV
devices.

Test: Manually tested that removable storage devices will now mount on
ATV and that restricted mode works again.
Bug: 71551000

Change-Id: I96c18dc956dee4ddaf128520e086233989135f10

6 years agoMerge "Ignore flaky tests"
TreeHugger Robot [Thu, 1 Feb 2018 18:39:59 +0000 (18:39 +0000)]
Merge "Ignore flaky tests"

6 years agoMerge "Migrate to lifecycle events from architecture components."
Leif Wilden [Thu, 1 Feb 2018 18:25:40 +0000 (18:25 +0000)]
Merge "Migrate to lifecycle events from architecture components."

6 years agoMigrate to lifecycle events from architecture components.
Leif Hendrik Wilden [Wed, 31 Jan 2018 22:32:36 +0000 (14:32 -0800)]
Migrate to lifecycle events from architecture components.

Bug: 70572789
Test: Added unit test. Manual: adb logcat -b events | egrep "(sysui_|notification_)".
Change-Id: If249f16c06ac439c6da1e419142bff6f22ffb0c9

6 years agoMerge "Re-added Dimmer for IME window container"
Chavi Weingarten [Thu, 1 Feb 2018 18:09:07 +0000 (18:09 +0000)]
Merge "Re-added Dimmer for IME window container"

6 years agoMerge "Use WS pending transaction for MoveAnimation"
Chavi Weingarten [Thu, 1 Feb 2018 18:07:50 +0000 (18:07 +0000)]
Merge "Use WS pending transaction for MoveAnimation"

6 years agoRemove clipping from QSContainerImpl
Evan Laird [Thu, 1 Feb 2018 18:07:19 +0000 (13:07 -0500)]
Remove clipping from QSContainerImpl

No longer necessary to achieve roundedness

Test: visual
Change-Id: I3206b75b852f18480c7b96a568c322e2f05cf844
Fixes: 72762900

6 years agoRevert "Uses back and home button for screen pinning when recents is invisible"
Matthew Ng [Thu, 1 Feb 2018 18:03:08 +0000 (18:03 +0000)]
Revert "Uses back and home button for screen pinning when recents is invisible"

This reverts commit c4356fb75318967148e8394878af1c13d37080dd.

Reason for revert: Regression b/72800226

Change-Id: Iaa14de444c00a9da7c3b3a6d8828f40d66a8ac29

6 years agoFix flicker with remote animations
Jorim Jaggi [Wed, 31 Jan 2018 17:45:39 +0000 (18:45 +0100)]
Fix flicker with remote animations

There was a race condition where we notified the controlling app
already about transition start, which itself started the animation
and applied the transform of the first frame. However, a little
bit later, we applied the pending transaction from window manager,
which overrode the properties again, leading to a flicker.

Test: go/wm-smoke
Test: Press home button, observe never a flicker
Bug: Surprisingly there isn't one yet.
Change-Id: I849a1573e6fd0487b9b5c22c7a7525bc818661cc

6 years agoDelete alert window notification channel when no longer used
Wale Ogunwale [Thu, 1 Feb 2018 17:07:34 +0000 (09:07 -0800)]
Delete alert window notification channel when no longer used

We no longer need the notification channel for alert window
use for a process e.g. the package is uninstalled, then go ahead
and delete the channel.

Change-Id: I2dea9af0e73810f91b248ad85cab73fa4f8271f4
Fixes: 67883657
Test: steps from bug

6 years agoMake ambient brightness day stats a system API
Peeyush Agarwal [Wed, 31 Jan 2018 19:07:20 +0000 (19:07 +0000)]
Make ambient brightness day stats a system API

Test: atest android.hardware.display.AmbientBrightnessDayStatsTest
Bug: 69406079
Change-Id: I83f476f22a2100d324862cbea2a139eababa9d4e

6 years agoMerge "Support dimension in condition in metric producers."
TreeHugger Robot [Thu, 1 Feb 2018 17:18:37 +0000 (17:18 +0000)]
Merge "Support dimension in condition in metric producers."

6 years agoMerge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
David Srbecky [Thu, 1 Feb 2018 17:17:42 +0000 (17:17 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
am: ddd440b8a2

Change-Id: Ic6bb0ab7eeaee99b625f035d0745df00f701c9c5

6 years agoMerge "Fix manual brightness slider"
Kenny Guy [Thu, 1 Feb 2018 17:06:35 +0000 (17:06 +0000)]
Merge "Fix manual brightness slider"

6 years agoMerge "Up the version of the database"
TreeHugger Robot [Thu, 1 Feb 2018 16:50:24 +0000 (16:50 +0000)]
Merge "Up the version of the database"

6 years agoIgnore flaky tests
Julia Reynolds [Thu, 1 Feb 2018 14:27:13 +0000 (09:27 -0500)]
Ignore flaky tests

And delete zenpaneltest - it causes other tests to fail flakily,
and isn't currently used.

Change-Id: I15a9201128656a4f75eeab6d0d250534062bfbbf
Fixes: 72785419
Test: atest SystemUITests

6 years agoMerge "Add audio presentation interface to Java API"
Mikhail Naganov [Thu, 1 Feb 2018 16:46:07 +0000 (16:46 +0000)]
Merge "Add audio presentation interface to Java API"

6 years agoMerge "Scale timeout with animation scale"
Jorim Jaggi [Thu, 1 Feb 2018 16:10:35 +0000 (16:10 +0000)]
Merge "Scale timeout with animation scale"

6 years agoMerge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
David Srbecky [Thu, 1 Feb 2018 15:31:05 +0000 (15:31 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."

6 years agoMerge "Revert "Split HeadsUpManager implementation to HeadsUpManagerPhone""
Yoshiki Iguchi [Thu, 1 Feb 2018 15:19:52 +0000 (15:19 +0000)]
Merge "Revert "Split HeadsUpManager implementation to HeadsUpManagerPhone""

6 years agoMerge "Add divider between QS and footer."
TreeHugger Robot [Thu, 1 Feb 2018 15:07:38 +0000 (15:07 +0000)]
Merge "Add divider between QS and footer."

6 years agoClear slice access grants on package clear/remove
Jason Monk [Wed, 31 Jan 2018 20:51:52 +0000 (15:51 -0500)]
Clear slice access grants on package clear/remove

Test: uiservicestests
Bug: 68751119
Change-Id: Ie5bd29a8c02cdfe7b634d2a302c625524ffcb89a

6 years ago[RTT] Route legacy RTT API on top of new RTT API
Etan Cohen [Tue, 30 Jan 2018 15:09:33 +0000 (07:09 -0800)]
[RTT] Route legacy RTT API on top of new RTT API

Route legacy RttManager API on top of new WifiRttManager API - but
only support the legacy startRanging call. All others (including
Responder modes) are deprecated and throw an exception.

Note: the deprecation tags will be in a separate CL.

Bug: 65108579
Test: unit tests pass
Test: WifiRttManagerTest:test_regular_scan_then_rtt_ranging_stress
Change-Id: I63541fdcaac36f4bb40ed71660bbcfc507693ffc

6 years agoScale timeout with animation scale
Jorim Jaggi [Thu, 1 Feb 2018 14:03:59 +0000 (15:03 +0100)]
Scale timeout with animation scale

So slowed down animations still work
Test: RemoteAnimationControllerTest
Test: go/wm-smoke-auto

Change-Id: I23116fdd0f2e75e4320bd77aee704d1e2a9de5e7

6 years agoRevert "Split HeadsUpManager implementation to HeadsUpManagerPhone"
yoshiki iguchi [Thu, 1 Feb 2018 04:46:26 +0000 (13:46 +0900)]
Revert "Split HeadsUpManager implementation to HeadsUpManagerPhone"

This reverts commit 78db3d0b0fd4bcae0ec92913e2b39491bffa409b.

Reason for revert: Cause crash

Test: none
Change-Id: Iffdad2513158c0856a0d3b56f7667063f4bba91c

6 years agoUp the version of the database
Robert Berry [Thu, 1 Feb 2018 12:49:31 +0000 (12:49 +0000)]
Up the version of the database

We should have done this every time the schema changed, and written
appropriate upgrade SQL. Unfortunately there are now devices in the
wild that initially created the database using older SQL. As such
they are missing columns. This causes them to crash when queries are
run against the DB expecting those columns to exist. As we didn't
up the version number, flashing a new build didn't cause the CREATE
SQL to run again.

Test: manual
Change-Id: I1daa263d9baa69af4abb4bebfe45586b1f9dfd0e

6 years agoMerge "Add Ambient Brightness tracker API"
TreeHugger Robot [Thu, 1 Feb 2018 12:15:15 +0000 (12:15 +0000)]
Merge "Add Ambient Brightness tracker API"

6 years agoMerge changes from topics "mediasession2_libraryroot", "mediasession2_commandbutton...
TreeHugger Robot [Thu, 1 Feb 2018 11:46:13 +0000 (11:46 +0000)]
Merge changes from topics "mediasession2_libraryroot", "mediasession2_commandbutton", "medianotification_updatable"

* changes:
  MediaSession2: Rename BrowserRoot to LibraryRoot and move to updatable
  MediaSession2: Move MediaSession2.CommandButton to updatable
  MediaSession2: Move MediaSessionService2.MediaNotification to updatable

6 years agoMerge "Added support for the new 1.2 data setup/deactivate API"
Jack Yu [Thu, 1 Feb 2018 11:21:00 +0000 (11:21 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API"

6 years agoFix manual brightness slider
Kenny Guy [Wed, 31 Jan 2018 15:57:15 +0000 (15:57 +0000)]
Fix manual brightness slider

Pending brightness change never stored
in current brightness.

Bug: 72725570
Test: manual - non-adaptive move slider check it works, reboot check brightness was persisted.
Test: manual - adaptive - move slider check it works.
Test: manual - verify slider events are logged for adaptive and not for manual brightness

Change-Id: If2914dcb223cf4308f178c101e862e6b4ba851bb

6 years agoMerge "Droidfood only: Move private APIs to dark greylist by default"
David Brazdil [Thu, 1 Feb 2018 11:07:39 +0000 (11:07 +0000)]
Merge "Droidfood only: Move private APIs to dark greylist by default"

6 years agoMerge "Add information about brightness config to slider events."
TreeHugger Robot [Thu, 1 Feb 2018 10:37:30 +0000 (10:37 +0000)]
Merge "Add information about brightness config to slider events."

6 years agoDroidfood only: Move private APIs to dark greylist by default
David Brazdil [Wed, 31 Jan 2018 14:43:36 +0000 (14:43 +0000)]
Droidfood only: Move private APIs to dark greylist by default

In order to tune the API lists, we initialize the light greylist with
APIs we know are used by popular apps. All the other private APIs are
moved into dark greylist. Light greylist will be set to not warn at
all, while dark greylist will produce warnings. This will allow us to
collect logs and tune the lists without breaking all of our dogfooders.

Bug: 64382372
Bug: 72793280
Test: make
Change-Id: Ice6c487eeca8900e6a70abe1b87e8c211ef1066e

6 years agoMediaSession2: Rename BrowserRoot to LibraryRoot and move to updatable
Jaewan Kim [Thu, 1 Feb 2018 06:16:25 +0000 (15:16 +0900)]
MediaSession2: Rename BrowserRoot to LibraryRoot and move to updatable

Renaming was the one of the feedback from ag/3506231

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

6 years agoMediaSession2: Move MediaSession2.CommandButton to updatable
Jaewan Kim [Thu, 1 Feb 2018 05:33:55 +0000 (14:33 +0900)]
MediaSession2: Move MediaSession2.CommandButton to updatable

Bug: 72665718
Test: Run all MediaComponents test once
Change-Id: I5e6b382695b9d8c2f9634531ded32fdac438965c

6 years agoMediaSession2: Move MediaSessionService2.MediaNotification to updatable
Jaewan Kim [Thu, 1 Feb 2018 02:56:22 +0000 (11:56 +0900)]
MediaSession2: Move MediaSessionService2.MediaNotification to updatable

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

6 years agoMerge "Support query active microphones in MediaRecorder."
TreeHugger Robot [Thu, 1 Feb 2018 07:52:55 +0000 (07:52 +0000)]
Merge "Support query active microphones in MediaRecorder."

6 years agoMerge "Implements StatsManager temporary stubs."
TreeHugger Robot [Thu, 1 Feb 2018 07:37:30 +0000 (07:37 +0000)]
Merge "Implements StatsManager temporary stubs."

6 years agoMerge "Updating TextClassifier factory model names"
Jan Althaus [Thu, 1 Feb 2018 06:43:45 +0000 (06:43 +0000)]
Merge "Updating TextClassifier factory model names"

6 years agoMerge "Parse persist property the legacy way"
TreeHugger Robot [Thu, 1 Feb 2018 05:03:37 +0000 (05:03 +0000)]
Merge "Parse persist property the legacy way"

6 years agoEnable sendfile() and splice() optimizations.
Jeff Sharkey [Thu, 1 Feb 2018 04:51:57 +0000 (21:51 -0700)]
Enable sendfile() and splice() optimizations.

This can easily be reverted if we uncover any trouble.

Test: bit FrameworksCoreTests:android.os.FileUtilsTest
Test: vogar --mode app_process --benchmark frameworks/base/core/tests/benchmarks/src/android/os/FileUtilsBenchmark.java
Bug: 71932978
Change-Id: Iac97c342948074c4f373e5f2ae70e563b308a11e

6 years agoUse sendfile() and splice() to speed up copying.
Jeff Sharkey [Thu, 1 Feb 2018 04:47:09 +0000 (21:47 -0700)]
Use sendfile() and splice() to speed up copying.

There are several places across the OS where Java code is simply
copying data between two points, which requires bringing that data
out into userspace before going back into the kernel.  (That's pretty
lame.)  The patches for the recent Meltdown/Spectre security issues
have made this overhead even worse, so it's finally time to move this
copying directly into the kernel.

This change adds a couple new FileUtils.copy() methods which inspect
the given streams/FDs, and attempt to do as much optimization as
possible before falling back to a slower userspace-based copy.

Benchmarks are showing typical improvements of 44% for 32KB files,
50% for 32MB files, and 35% for 32MB pipes.

Plenty of tests are included, and there's a simple kill-switch that
can be used to enable/disable the feature if it starts causing any
trouble.  (A future CL will enable the optimizations.)

Test: bit FrameworksCoreTests:android.os.FileUtilsTest
Test: vogar --mode app_process --benchmark frameworks/base/core/tests/benchmarks/src/android/os/FileUtilsBenchmark.java
Bug: 71932978
Change-Id: I52518d529da5d961610998b9f61399064d8025cd

6 years ago[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into...
Android Build Merger (Role) [Thu, 1 Feb 2018 04:23:49 +0000 (04:23 +0000)]
[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev am: afb1b1aeb6 am: 753fdb8bb6 am: 542f647684 am: 687a6d23c5 am: fee7f53322
am: 523e0f9210

Change-Id: I6056096461fc2d61abcd2db886aa7668761f0905

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev...
Android Build Merger (Role) [Thu, 1 Feb 2018 04:18:41 +0000 (04:18 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev am: 82db4c8b41 am: 4205b8a166 am: 723efe6935 am: 7131d4b415
am: b540cf4d1c

Change-Id: I5b41bf0dc81b0756348a6f315a4edf8fc9788bd2

6 years agoMediaControlView2: Remove getProvider()
Sungsoo Lim [Thu, 1 Feb 2018 04:16:30 +0000 (13:16 +0900)]
MediaControlView2: Remove getProvider()

getProvider() is already in the super class.

Test: build
Change-Id: I89e9dc18da248a94fa8b99e04148278558b1169d

6 years agoMerge "Fix minor bugs with tunnel mode implementation" am: cb9cd96c50 am: b7afa3f6fb
Benedict Wong [Thu, 1 Feb 2018 04:12:18 +0000 (04:12 +0000)]
Merge "Fix minor bugs with tunnel mode implementation" am: cb9cd96c50 am: b7afa3f6fb
am: dcb9219764

Change-Id: Ie74c4edcc7586e0220ff948222010e126841e8f7

6 years agoMerge "Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger...
Android Build Merger (Role) [Thu, 1 Feb 2018 04:04:06 +0000 (04:04 +0000)]
Merge "Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34 am: 98568f57ad" into oc-mr1-dev-plus-aosp am: e8626dee42"

6 years agoMerge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote...
Android Build Merger (Role) [Thu, 1 Feb 2018 04:03:42 +0000 (04:03 +0000)]
Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34 am: 98568f57ad" into oc-mr1-dev-plus-aosp
am: e8626dee42

Change-Id: Ia800a77c6c172770726e4fd2a132137ae209eb45

6 years agoMerge changes I855f5315,I9ac7e13e,I003837a9
TreeHugger Robot [Thu, 1 Feb 2018 04:03:36 +0000 (04:03 +0000)]
Merge changes I855f5315,I9ac7e13e,I003837a9

* changes:
  WSA: More dead code.
  Restore pinned stack shadows.
  Nuke WSA#mClipRect/mHasClipRect

6 years ago[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into...
Android Build Merger (Role) [Thu, 1 Feb 2018 04:00:02 +0000 (04:00 +0000)]
[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev am: afb1b1aeb6 am: 753fdb8bb6 am: 542f647684 am: 687a6d23c5
am: fee7f53322

Change-Id: I92187dc7dd55b3fe5904f1d6829940a1296cb538

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:54:39 +0000 (03:54 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev am: 82db4c8b41 am: 4205b8a166 am: 723efe6935
am: 7131d4b415

Change-Id: I65b5bae4f58f49a5786b5f587139e60c4122a26f

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:51:22 +0000 (03:51 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f57e am: b39e49d52c am: 1c4ccab92b
am: 5b46d98a7a

Change-Id: Ia4e81a8d30a22fad6d2e99c05bf994e4faaf58f5

6 years agoMerge "Fix minor bugs with tunnel mode implementation" am: cb9cd96c50
Benedict Wong [Thu, 1 Feb 2018 03:49:45 +0000 (03:49 +0000)]
Merge "Fix minor bugs with tunnel mode implementation" am: cb9cd96c50
am: b7afa3f6fb

Change-Id: I9c2a844d9ccc401a34d0e6318506406e8c33fab6

6 years ago[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:38:06 +0000 (03:38 +0000)]
[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev am: afb1b1aeb6 am: 753fdb8bb6 am: 542f647684
am: 687a6d23c5

Change-Id: Ia5ab8296347a9698cf2e18b80366698db40d438e

6 years agoMerge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:36:16 +0000 (03:36 +0000)]
Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34 am: 98568f57ad" into oc-mr1-dev-plus-aosp

6 years agoMerge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked...
Alex Light [Thu, 1 Feb 2018 03:35:32 +0000 (03:35 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34
am: 98568f57ad

Change-Id: Iaecbcf1bf3d948163c2d06261577f63884206edb

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:35:27 +0000 (03:35 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f57e am: b39e49d52c
am: 1c4ccab92b

Change-Id: I32ba85cdc40ea77772361ffb399085f7b8a67416

6 years agoMerge "Fix minor bugs with tunnel mode implementation"
Benedict Wong [Thu, 1 Feb 2018 03:30:44 +0000 (03:30 +0000)]
Merge "Fix minor bugs with tunnel mode implementation"
am: cb9cd96c50

Change-Id: I94210f595e904d13711feb97e77a3373d8cce1b0

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:30:15 +0000 (03:30 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev am: 82db4c8b41 am: 4205b8a166
am: 723efe6935

Change-Id: Ic264904353cf9e3b184b32fc33d0d3479ad65f4e

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:24:13 +0000 (03:24 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f57e
am: b39e49d52c

Change-Id: Iaf02c5ebdb656fc79cde201e6df97760283ea4e4

6 years agoMerge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked...
Alex Light [Thu, 1 Feb 2018 03:23:23 +0000 (03:23 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."""
am: 3b50dc3d34

Change-Id: Ie10dab211f77420b1f38833e6aa718365c37ea9a

6 years ago[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:20:23 +0000 (03:20 +0000)]
[automerger] Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into cw-f-dev am: afb1b1aeb6 am: 753fdb8bb6
am: 542f647684

Change-Id: I4ca0c56badef09ee37e130f3183bd8f27b9e5947

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev...
Android Build Merger (Role) [Thu, 1 Feb 2018 03:18:27 +0000 (03:18 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into nyc-mr2-dev am: 82db4c8b41
am: 4205b8a166

Change-Id: Ic1f9b793f7a5836bdf7e6f3520d3ad7e90732141

6 years agoMerge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev
Android Build Merger (Role) [Thu, 1 Feb 2018 03:13:16 +0000 (03:13 +0000)]
Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev
am: 46fc48f57e

Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa

6 years agoMerge changes I4a907600,If3205033
TreeHugger Robot [Thu, 1 Feb 2018 02:27:32 +0000 (02:27 +0000)]
Merge changes I4a907600,If3205033

* changes:
  Marking used instant apps fields as System API
  Revert "Revert "Removes EphemrealResolverService and related""

6 years agoParse persist property the legacy way
Jerry Zhang [Thu, 1 Feb 2018 02:02:38 +0000 (18:02 -0800)]
Parse persist property the legacy way

Devices like bat still have oem functions
in the persist prop, so don't throw errors.

Test: device boots
Bug: 72765363
Change-Id: I7d1e334d7cafb1ba1f328ee4160da3b098f76fa1

6 years agoMerge "Uses back and home button for screen pinning when recents is invisible"
TreeHugger Robot [Thu, 1 Feb 2018 02:13:11 +0000 (02:13 +0000)]
Merge "Uses back and home button for screen pinning when recents is invisible"

6 years agoMerge "Support query active microphones information in AudioRecord."
TreeHugger Robot [Thu, 1 Feb 2018 01:35:26 +0000 (01:35 +0000)]
Merge "Support query active microphones information in AudioRecord."

6 years agoAtom: Remaining and full battery capacity
Tej Singh [Thu, 11 Jan 2018 04:51:13 +0000 (20:51 -0800)]
Atom: Remaining and full battery capacity

Add pulled remaining battery capacity and full battery capacity atoms.

Test: cts test accompanies
Change-Id: I0f09e9459b56e25cc3ac21e1a5e781daadea0a01

6 years agoUse statsd constants instead of literals
Bookatz [Wed, 31 Jan 2018 23:05:57 +0000 (15:05 -0800)]
Use statsd constants instead of literals

Instead of writing StatsLog.write(StatsLog.NAME, 1), we replace the 1
with the appropriate StatsLog constant.

Bug: 72749863
Test: still compiles

Change-Id: I68c8206de49df7e77ee66333dd633e4b70c7b226

6 years agoImplements StatsManager temporary stubs.
David Chen [Thu, 1 Feb 2018 00:38:13 +0000 (16:38 -0800)]
Implements StatsManager temporary stubs.

Need to use the old API for a bit, so the temporary API will convert
the arguments for ConfigKey from String to Long and then call the
correct API from statsd.

This can be deleted in the future.

Test: Test that marlin-eng can build.
Change-Id: Iebaf2debc08c749ecaae631201e7d039b916f0ce