OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a...
Android Build Merger (Role) [Wed, 7 Feb 2018 03:18:14 +0000 (03:18 +0000)]
Merge "Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am: 772d17c263 am: 07e1d78346"

6 years agoMerge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am...
Hall Liu [Wed, 7 Feb 2018 03:16:29 +0000 (03:16 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am: 772d17c263
am: 07e1d78346

Change-Id: I9ab304409e6f777593e6c927bb0d76b8f82038fc

6 years agoMerge "Get swipe up onboarding text from launcher"
TreeHugger Robot [Wed, 7 Feb 2018 03:15:00 +0000 (03:15 +0000)]
Merge "Get swipe up onboarding text from launcher"

6 years agoMerge "Move CarServiceHelperService (again)"
TreeHugger Robot [Wed, 7 Feb 2018 02:41:28 +0000 (02:41 +0000)]
Merge "Move CarServiceHelperService (again)"

6 years agoMerge "Merge "Add strings and carrier config needed network service." am: a3ccb8d854...
Android Build Merger (Role) [Wed, 7 Feb 2018 02:20:06 +0000 (02:20 +0000)]
Merge "Merge "Add strings and carrier config needed network service." am: a3ccb8d854 am: 0c2a5852f5 am: d7672c6f49  -s ours"

6 years agoMerge "Fix ApplicationInfo.isAllowedToUseHiddenApi predicate"
David Brazdil [Wed, 7 Feb 2018 02:19:02 +0000 (02:19 +0000)]
Merge "Fix ApplicationInfo.isAllowedToUseHiddenApi predicate"

6 years agoMerge "Add strings and carrier config needed network service." am: a3ccb8d854 am...
Malcolm Chen [Wed, 7 Feb 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Add strings and carrier config needed network service." am: a3ccb8d854 am: 0c2a5852f5
am: d7672c6f49  -s ours

Change-Id: I7ae9723f0390d2b477749f7f6f4c28160ffb1664

6 years agoMerge "[QS] Change secondary label for night light"
TreeHugger Robot [Wed, 7 Feb 2018 02:16:30 +0000 (02:16 +0000)]
Merge "[QS] Change secondary label for night light"

6 years agoMerge "Add missing copyright messages" am: 872f386f6b am: 32a1dc5075
Colin Cross [Wed, 7 Feb 2018 02:13:05 +0000 (02:13 +0000)]
Merge "Add missing copyright messages" am: 872f386f6b am: 32a1dc5075
am: cf4d62fdd3

Change-Id: I75f2c81a9e7c7ec0175e50b3bb58cedc8c36a2be

6 years agoMerge "Add perf tests for PendingIntent"
TreeHugger Robot [Wed, 7 Feb 2018 02:02:12 +0000 (02:02 +0000)]
Merge "Add perf tests for PendingIntent"

6 years agoMerge "Fix JavaDoc for enableWriteAheadLogging"
Fyodor Kupolov [Wed, 7 Feb 2018 01:51:57 +0000 (01:51 +0000)]
Merge "Fix JavaDoc for enableWriteAheadLogging"

6 years agoGet swipe up onboarding text from launcher
Tony Wickham [Tue, 6 Feb 2018 20:32:54 +0000 (12:32 -0800)]
Get swipe up onboarding text from launcher

Launcher sends the text when binding to the overview service,
which stores the text for when it needs to be shown.

Also renamed some files and strings to be more generic

Test: install launcher with updated text and ensure it is shown

Bug: 72999860
Change-Id: I5998ab8867754d877f954673e03e5faf44b606ed

6 years agoMerge "JobScheduler to use UID active state for job exemption"
Makoto Onuki [Wed, 7 Feb 2018 01:09:12 +0000 (01:09 +0000)]
Merge "JobScheduler to use UID active state for job exemption"

6 years agoMerge "Stop statsd Anomaly Detection crash"
TreeHugger Robot [Wed, 7 Feb 2018 01:00:46 +0000 (01:00 +0000)]
Merge "Stop statsd Anomaly Detection crash"

6 years agoMerge "Continue to decrypt other application keys if one fails to decrypt"
TreeHugger Robot [Wed, 7 Feb 2018 00:41:40 +0000 (00:41 +0000)]
Merge "Continue to decrypt other application keys if one fails to decrypt"

6 years agoMerge "Display blanking logic improvements"
Lucas Dupin [Wed, 7 Feb 2018 00:34:28 +0000 (00:34 +0000)]
Merge "Display blanking logic improvements"

6 years agoMerge "Allow statsd_config be able to set destination value AUTO/EXPLICIT."
TreeHugger Robot [Wed, 7 Feb 2018 00:27:56 +0000 (00:27 +0000)]
Merge "Allow statsd_config be able to set destination value AUTO/EXPLICIT."

6 years agoFix ApplicationInfo.isAllowedToUseHiddenApi predicate
David Brazdil [Wed, 7 Feb 2018 00:20:21 +0000 (00:20 +0000)]
Fix ApplicationInfo.isAllowedToUseHiddenApi predicate

FLAG_UPDATED_SYSTEM_APP does not imply FLAG_SYSTEM, need to check both.

Bug: 64382372
Test: make
Change-Id: I1ad87c5ef0ad90c090da9264b894ae25e87996ae

6 years agoAdd perf tests for PendingIntent
Arthur Eubanks [Wed, 10 Jan 2018 22:00:20 +0000 (14:00 -0800)]
Add perf tests for PendingIntent

Test: m CorePerfTests
Test: adbi "$OUT"/data/app/CorePerfTests/CorePerfTests.apk
Test: adb shell am instrument -w -e class \
android.app.PendingIntentPerfTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner

BUG: 67460485

Change-Id: I45bfc694454b466041d81e37a9010d58c170a4d3

6 years agoMerge "Add display panel low power mode global setting & mapping to sys property."
TreeHugger Robot [Tue, 6 Feb 2018 23:48:32 +0000 (23:48 +0000)]
Merge "Add display panel low power mode global setting & mapping to sys property."

6 years agoMerge "remove unused/deprecated flags from savelayer"
TreeHugger Robot [Tue, 6 Feb 2018 23:43:42 +0000 (23:43 +0000)]
Merge "remove unused/deprecated flags from savelayer"

6 years agoMerge "Fixed an issue where we would access the wrong drawable"
Selim Cinek [Tue, 6 Feb 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fixed an issue where we would access the wrong drawable"

6 years agoMerge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a
Hall Liu [Tue, 6 Feb 2018 23:28:17 +0000 (23:28 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a
am: 772d17c263

Change-Id: I7e2fd26aad4c09bca97142279434fb108abae848

6 years agoFixed an issue where we would access the wrong drawable
Selim Cinek [Tue, 6 Feb 2018 23:24:25 +0000 (15:24 -0800)]
Fixed an issue where we would access the wrong drawable

Quick follow up fix the inline images

Test: add notification with image
Change-Id: I21c149b0cd63bc93895eee34be5e68d3caef0298

6 years agoMerge "Increase instant app privacy with dummy data"
TreeHugger Robot [Tue, 6 Feb 2018 23:18:13 +0000 (23:18 +0000)]
Merge "Increase instant app privacy with dummy data"

6 years agoMerge "Implemented support for inline images"
Selim Cinek [Tue, 6 Feb 2018 23:15:00 +0000 (23:15 +0000)]
Merge "Implemented support for inline images"

6 years agoMerge "Add strings and carrier config needed network service." am: a3ccb8d854
Malcolm Chen [Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)]
Merge "Add strings and carrier config needed network service." am: a3ccb8d854
am: 0c2a5852f5

Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a

6 years agoMerge "Add missing copyright messages" am: 872f386f6b
Colin Cross [Tue, 6 Feb 2018 23:06:08 +0000 (23:06 +0000)]
Merge "Add missing copyright messages" am: 872f386f6b
am: 32a1dc5075

Change-Id: I9602e1c9dda5e842fd71c9f48cf354aea4650d74

6 years agoMerge "Add logging for output chooser."
TreeHugger Robot [Tue, 6 Feb 2018 23:05:08 +0000 (23:05 +0000)]
Merge "Add logging for output chooser."

6 years agoMerge "Revert "Check for location access on TelephonyRegistry""
Hall Liu [Tue, 6 Feb 2018 22:50:34 +0000 (22:50 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
am: 39393f889a

Change-Id: I74a817ac04cc754a291521ae03fcf648b00494f9

6 years agoMerge "Use new minikin::Font constructor"
TreeHugger Robot [Tue, 6 Feb 2018 22:47:46 +0000 (22:47 +0000)]
Merge "Use new minikin::Font constructor"

6 years agoMerge "Revert "Remove @hide from ViewGroup debug methods""
TreeHugger Robot [Tue, 6 Feb 2018 22:45:40 +0000 (22:45 +0000)]
Merge "Revert "Remove @hide from ViewGroup debug methods""

6 years agoMerge "Remove unused flags from IHwBinder."
Steven Moreland [Tue, 6 Feb 2018 22:45:11 +0000 (22:45 +0000)]
Merge "Remove unused flags from IHwBinder."

6 years agoContinue to decrypt other application keys if one fails to decrypt
Bo Zhu [Tue, 6 Feb 2018 22:34:48 +0000 (14:34 -0800)]
Continue to decrypt other application keys if one fails to decrypt

An exception will still be thrown if all the application keys fail to
decrypt.

Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Bug: 72932279
Change-Id: I95befcd46672b77380226e61369759de5617ecea

6 years agoStop statsd Anomaly Detection crash
Bookatz [Tue, 6 Feb 2018 22:24:49 +0000 (14:24 -0800)]
Stop statsd Anomaly Detection crash

AnomalyAlarmReceiver needs to be public or it crashes the system when
AppComponentFactory tries to access it when an alarm fires.

Change-Id: I79d1d73e9b98d3da74e3cb34fbafc8da8c5e2e8f
Fixes: 73004903
Test: manual

6 years agoMerge "Add strings and carrier config needed network service."
Malcolm Chen [Tue, 6 Feb 2018 22:28:41 +0000 (22:28 +0000)]
Merge "Add strings and carrier config needed network service."
am: a3ccb8d854

Change-Id: Id72bfe77c515028a055268bf9ba2d23e7b310d3e

6 years agoMerge "Add missing copyright messages"
Colin Cross [Tue, 6 Feb 2018 22:22:19 +0000 (22:22 +0000)]
Merge "Add missing copyright messages"
am: 872f386f6b

Change-Id: If54622ff6ed84dca262a8e65deb44bacbfc5b280

6 years agoMerge "Fix small issues with event flow for quickscrub"
TreeHugger Robot [Tue, 6 Feb 2018 21:49:33 +0000 (21:49 +0000)]
Merge "Fix small issues with event flow for quickscrub"

6 years agoMerge "Fix issue where pulse callback would be delayed"
Lucas Dupin [Tue, 6 Feb 2018 21:49:13 +0000 (21:49 +0000)]
Merge "Fix issue where pulse callback would be delayed"

6 years agoMerge "puller cache clearing"
TreeHugger Robot [Tue, 6 Feb 2018 21:42:48 +0000 (21:42 +0000)]
Merge "puller cache clearing"

6 years agoJobScheduler to use UID active state for job exemption
Makoto Onuki [Tue, 6 Feb 2018 19:30:15 +0000 (11:30 -0800)]
JobScheduler to use UID active state for job exemption

JobScheduler used to use procstate foreground state to decide whether
to exempt jobs, but it should use UID's active state instead, so that
if apps in the temp-whitelist schedule jobs, they run immediately.

Test: Boot
Test: atest CtsAlarmManagerTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest CtsBatterySavingTestCases
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/AppStateTrackerTest.java

Change-Id: I134ac3d84a26309dab56ab6cbb271de626acdf7d

6 years agoMerge "Remove selection on nonselectable text (which would be there if a user tapped...
Richard Ledley [Tue, 6 Feb 2018 21:34:45 +0000 (21:34 +0000)]
Merge "Remove selection on nonselectable text (which would be there if a user tapped Linkified text) if a TextView loses focus."

6 years agoremove unused/deprecated flags from savelayer
Mike Reed [Tue, 6 Feb 2018 21:18:07 +0000 (16:18 -0500)]
remove unused/deprecated flags from savelayer

Test: make

Change-Id: I39e41a80430dca7878e6983b098c1c4541904fd1

6 years agoMerge "Revert "Check for location access on TelephonyRegistry""
Hall Liu [Tue, 6 Feb 2018 21:15:42 +0000 (21:15 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""

6 years agoAdd logging for output chooser.
Julia Reynolds [Tue, 6 Feb 2018 19:47:30 +0000 (14:47 -0500)]
Add logging for output chooser.

Show, hide, connect, and disconnect

Test: compare eventlog to action history
Fixes: 72999809
Change-Id: I545916c66b82703eb769b3264a7e920dde9c40ee

6 years agoMerge "Don't change stream volume on mute"
TreeHugger Robot [Tue, 6 Feb 2018 21:07:29 +0000 (21:07 +0000)]
Merge "Don't change stream volume on mute"

6 years agoMerge "Add strings and carrier config needed network service."
Treehugger Robot [Tue, 6 Feb 2018 20:57:25 +0000 (20:57 +0000)]
Merge "Add strings and carrier config needed network service."

6 years agoMerge "Add missing copyright messages"
Treehugger Robot [Tue, 6 Feb 2018 20:47:51 +0000 (20:47 +0000)]
Merge "Add missing copyright messages"

6 years agoMerge "Add privacy tags to print dumping"
TreeHugger Robot [Tue, 6 Feb 2018 20:29:23 +0000 (20:29 +0000)]
Merge "Add privacy tags to print dumping"

6 years agoMerge "Fixes crash when pinning unfocused task in multiwindow"
TreeHugger Robot [Tue, 6 Feb 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Fixes crash when pinning unfocused task in multiwindow"

6 years agoAdd display panel low power mode global setting & mapping to sys property.
Ajay Dudani [Mon, 5 Feb 2018 18:44:27 +0000 (10:44 -0800)]
Add display panel low power mode global setting & mapping to sys property.

This will help us run P/H experiments by controlling display panel low
power mode system property through P/H.

Bug: 72121774
Test: Compile, boot taimen.
Change-Id: Id4c95bcd5616e9749f9dcc9d9f4773ffdad3e994

6 years agoMerge "Add metrics constants for new settings screens."
TreeHugger Robot [Tue, 6 Feb 2018 20:13:19 +0000 (20:13 +0000)]
Merge "Add metrics constants for new settings screens."

6 years agoMerge "Try to check the platform decryption key is still accessible before using...
Bo Zhu [Tue, 6 Feb 2018 20:13:14 +0000 (20:13 +0000)]
Merge "Try to check the platform decryption key is still accessible before using the platform encryption key"

6 years agoMove CarServiceHelperService (again)
Steve Paik [Sat, 27 Jan 2018 01:16:53 +0000 (17:16 -0800)]
Move CarServiceHelperService (again)

Move CarServiceHelperService.java and ICarServiceHelper.aidl from
frameworks/base to frameworks/opt/car/services.

Bug: 72571496
Test: Complies and runs
Change-Id: I0f09c84e25a372dab3f170bd623f25a92f9b0f73

6 years agoMerge changes from topic "assetmanager2"
Adam Lesinski [Tue, 6 Feb 2018 19:52:36 +0000 (19:52 +0000)]
Merge changes from topic "assetmanager2"

* changes:
  libandroidfw: Improve performance of AssetManager2
  libandroidfw: Add ApplyStyle and SetConfiguration benchmark
  Make idiomatic use of ApkAssets and AssetManager
  libandroidfw: Make sure to set the 'app as lib' flag
  Replace AssetManager with AssetManager2 implementation

6 years agoMerge "Revert "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset.""
TreeHugger Robot [Tue, 6 Feb 2018 19:45:37 +0000 (19:45 +0000)]
Merge "Revert "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset.""

6 years agoIncrease instant app privacy with dummy data
Patrick Baumann [Tue, 6 Feb 2018 17:55:36 +0000 (09:55 -0800)]
Increase instant app privacy with dummy data

This change adds some additional digest prefixes to instant app
resolution to make inverting the hash more difficult.

Change-Id: Ibf907495019338b5cac5dd22da275799e92f9b60
Fixes: 63445230
Test: manual - resolution still works with current production resolver

6 years agoMerge "split subsystem name + split name into subsystem name and voter name"
TreeHugger Robot [Tue, 6 Feb 2018 19:30:51 +0000 (19:30 +0000)]
Merge "split subsystem name + split name into subsystem name and voter name"

6 years agosplit subsystem name
Chenjie Yu [Tue, 6 Feb 2018 00:51:52 +0000 (16:51 -0800)]
split subsystem name
+ split name into subsystem name and voter name

Test: cts test
Change-Id: Id2baff625acc5bc4ee04d994fa36c7518b18ef3d
Fix: 72967228

6 years agoAllow statsd_config be able to set destination value AUTO/EXPLICIT.
Yi Jin [Thu, 1 Feb 2018 03:14:25 +0000 (19:14 -0800)]
Allow statsd_config be able to set destination value AUTO/EXPLICIT.

Also move incidentd integration to its own files.
clang-format -style=file -i src/anomaly/* and src/subscribers/Incidentd*

Bug: 70239380
Test: manual
Change-Id: I7bfe14d704d9e86d925365a8a21ffed726723e60

6 years agopuller cache clearing
Chenjie Yu [Mon, 5 Feb 2018 22:37:48 +0000 (14:37 -0800)]
puller cache clearing

+ add adb command to manually clear puller cache
+ try to clear puller cache every 10s

Test: manual test
Change-Id: I8005cacd189de1880fcaeb030efbe21e6d3c0244

6 years agoAdd missing copyright messages
Colin Cross [Tue, 6 Feb 2018 19:10:25 +0000 (11:10 -0800)]
Add missing copyright messages

Bug: 72993971
Test: m sdkparcelables
Change-Id: I9fa422160c29ce3054748b2b8d1e26541a697a90

6 years agoMerge changes I2bb5d917,Ie91da3c7
Rob Carr [Tue, 6 Feb 2018 18:54:41 +0000 (18:54 +0000)]
Merge changes I2bb5d917,Ie91da3c7

* changes:
  Rename destroyInTransaction to destroyNotInTransaction.
  Ensure surfaces are reparented before destroying parent.

6 years agoMerge "[Magnifier - 19] Add non-basic CTS tests"
TreeHugger Robot [Tue, 6 Feb 2018 18:53:33 +0000 (18:53 +0000)]
Merge "[Magnifier - 19] Add non-basic CTS tests"

6 years agoMerge "Call ImageDecoder directly in ResourcesImpl"
TreeHugger Robot [Tue, 6 Feb 2018 18:34:40 +0000 (18:34 +0000)]
Merge "Call ImageDecoder directly in ResourcesImpl"

6 years agoFix small issues with event flow for quickscrub
Winson Chung [Tue, 6 Feb 2018 16:53:37 +0000 (08:53 -0800)]
Fix small issues with event flow for quickscrub

- Ensure that we return whether we handle quickscrub fling so that we
  don't proxy the associated up event
- Ensure that if we have already started quickscrub, that we don't return
  false to continue proxying events midway

Bug: 67957962
Bug: 70180755
Test: Enable quickscrub, start scrubbing and swipe up

Change-Id: I9e3728ed3781b36c38fc16c0d047665fb0c3b904
Signed-off-by: Winson Chung <winsonc@google.com>
6 years agoImplemented support for inline images
Selim Cinek [Fri, 26 Jan 2018 21:36:43 +0000 (13:36 -0800)]
Implemented support for inline images

Messaging Style always had API support to
display images, but they were never shown.
We are now displaying images inline

Bug: 63708826
Test: send messages with an image
Change-Id: I50c835b19f4846cb2cbfb17e9805eacffd9ec6b3

6 years agoRemove unused flags from IHwBinder.
Steven Moreland [Tue, 6 Feb 2018 18:26:22 +0000 (10:26 -0800)]
Remove unused flags from IHwBinder.

transaction start: this is interface dependent
flags: part of kernel ABI, unused here

Bug: 72877008
Test: N/A
Change-Id: Ic0f268cd0483edaf3cea7de90b5743e84292f427

6 years agoRevert "Check for location access on TelephonyRegistry"
Hall Liu [Tue, 6 Feb 2018 18:13:36 +0000 (18:13 +0000)]
Revert "Check for location access on TelephonyRegistry"

This reverts commit 8d584f0a91b0709b28ebc64abf0a6063429c8d58.

Reason for revert: b/72967560

Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654

6 years agoRemove selection on nonselectable text (which would be there if a user tapped Linkifi...
Richard Ledley [Mon, 5 Feb 2018 14:55:47 +0000 (14:55 +0000)]
Remove selection on nonselectable text (which would be there if a user tapped Linkified text) if a TextView loses focus.

Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest

Bug: 67629726
Change-Id: Ifc3039f0c814c422b2d727f837ca9c88abc2ebe8

6 years agoMerge "Ignore QS touches if scrolling is not possible."
TreeHugger Robot [Tue, 6 Feb 2018 18:03:41 +0000 (18:03 +0000)]
Merge "Ignore QS touches if scrolling is not possible."

6 years agoMerge "Improved logging on Autofill Save."
TreeHugger Robot [Tue, 6 Feb 2018 18:02:36 +0000 (18:02 +0000)]
Merge "Improved logging on Autofill Save."

6 years agoMerge "Isolate print out of process test from other tests"
TreeHugger Robot [Tue, 6 Feb 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Isolate print out of process test from other tests"

6 years agoMerge "Removes instant app visibility metadata check"
TreeHugger Robot [Tue, 6 Feb 2018 17:35:03 +0000 (17:35 +0000)]
Merge "Removes instant app visibility metadata check"

6 years agoMerge "Don't take a lock on the UI thread"
Makoto Onuki [Tue, 6 Feb 2018 17:27:29 +0000 (17:27 +0000)]
Merge "Don't take a lock on the UI thread"

6 years agoDon't change stream volume on mute
Julia Reynolds [Tue, 6 Feb 2018 14:02:12 +0000 (09:02 -0500)]
Don't change stream volume on mute

Setting ringer to silent is enough to silence all sounds on the ringer
stream.

Test: manual
Change-Id: I1700c08a36d3f70b0f798fb48769fe3a69c62f9b
Fixes: 72800255

6 years agoMerge "Disable sync job service WTF for now."
Makoto Onuki [Tue, 6 Feb 2018 17:14:06 +0000 (17:14 +0000)]
Merge "Disable sync job service WTF for now."

6 years agoMerge "Make printing policy a restriction."
Vladislav Kuzkokov [Tue, 6 Feb 2018 17:11:07 +0000 (17:11 +0000)]
Merge "Make printing policy a restriction."

6 years agoMerge "Adding warning text to dnd dialog"
TreeHugger Robot [Tue, 6 Feb 2018 17:09:33 +0000 (17:09 +0000)]
Merge "Adding warning text to dnd dialog"

6 years agoAdd privacy tags to print dumping
Philip P. Moltmann [Tue, 6 Feb 2018 16:57:43 +0000 (08:57 -0800)]
Add privacy tags to print dumping

Test: incident_report print, dumpsys print
Change-Id: I96384c2540727b4e9853a4854107600605de3d74

6 years agoMerge "AudioService: vol event for ext volume controller on volume thread"
Jean-Michel Trivi [Tue, 6 Feb 2018 16:47:26 +0000 (16:47 +0000)]
Merge "AudioService: vol event for ext volume controller on volume thread"

6 years agoMerge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"
TreeHugger Robot [Tue, 6 Feb 2018 16:47:22 +0000 (16:47 +0000)]
Merge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"

6 years agoAdd metrics constants for new settings screens.
Michael Wright [Fri, 26 Jan 2018 19:15:57 +0000 (19:15 +0000)]
Add metrics constants for new settings screens.

Bug: 64185329
Test: manual
Change-Id: I7147f17c9d5edb3a94c2e63d5acc1e655afbac3a

6 years agoMerge "Wireless charging sound used for wired charging"
Beverly Tai [Tue, 6 Feb 2018 16:29:09 +0000 (16:29 +0000)]
Merge "Wireless charging sound used for wired charging"

6 years agoRevert "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset."
Rob Carr [Tue, 6 Feb 2018 16:26:06 +0000 (16:26 +0000)]
Revert "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset."

This reverts commit 4ec0def38859d0e5b2457726e67653246903fe84.

Bug: 72953007
Change-Id: I2eaea957d07e9401016419e4e895a99978e7570f

6 years agoMerge changes Ie05a1759,If3b6fc63 am: 1f14eab551 am: 73771adf83
Paul Duffin [Tue, 6 Feb 2018 16:03:36 +0000 (16:03 +0000)]
Merge changes Ie05a1759,If3b6fc63 am: 1f14eab551 am: 73771adf83
am: 2c732796e1  -s ours

Change-Id: Ibd1a0b89d9eed1beaa89f17a46270997a981d0f9

6 years agoRemoves instant app visibility metadata check
Patrick Baumann [Mon, 5 Feb 2018 23:30:43 +0000 (15:30 -0800)]
Removes instant app visibility metadata check

Change-Id: I94c0ba08a429a60b3f7149e60f6e94f5c8e5617d
Fixes: 36551762
Test: atest EphemeralTest succeeds

6 years agoMerge "Fix TimePicker keyboard UI num digits for min"
TreeHugger Robot [Tue, 6 Feb 2018 15:52:53 +0000 (15:52 +0000)]
Merge "Fix TimePicker keyboard UI num digits for min"

6 years agoMerge "Correct inaccurate comments in build files" am: f55f221805 am: 654f09c3dd
Paul Duffin [Tue, 6 Feb 2018 15:48:24 +0000 (15:48 +0000)]
Merge "Correct inaccurate comments in build files" am: f55f221805 am: 654f09c3dd
am: 0c0d7091e6

Change-Id: I3c126807e8dc354e603baa439e05ac1e5a9c8676

6 years agoMerge changes Ie05a1759,If3b6fc63 am: 1f14eab551
Paul Duffin [Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)]
Merge changes Ie05a1759,If3b6fc63 am: 1f14eab551
am: 73771adf83

Change-Id: Iadca3cac054e707d193a7d054d091a13c78e0cbe

6 years agoMerge "Correct inaccurate comments in build files" am: f55f221805
Paul Duffin [Tue, 6 Feb 2018 15:34:34 +0000 (15:34 +0000)]
Merge "Correct inaccurate comments in build files" am: f55f221805
am: 654f09c3dd

Change-Id: I7bb06fe6c2ecc81d7997c2efee8bfb029b61e994

6 years agoMerge changes Ie05a1759,If3b6fc63
Paul Duffin [Tue, 6 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge changes Ie05a1759,If3b6fc63
am: 1f14eab551

Change-Id: I259f07c37e2797f07b9bfdc13f5ebc0d05429877

6 years agoMerge "Correct inaccurate comments in build files"
Paul Duffin [Tue, 6 Feb 2018 15:25:51 +0000 (15:25 +0000)]
Merge "Correct inaccurate comments in build files"
am: f55f221805

Change-Id: Iba1b710e00843d8c35c346d64d33250ce6654956

6 years agoCall ImageDecoder directly in ResourcesImpl
Leon Scroggins III [Thu, 1 Feb 2018 01:39:37 +0000 (20:39 -0500)]
Call ImageDecoder directly in ResourcesImpl

Test: Existing tests

Add a new (hidden) ImageDecoder.Source that accepts an AssetInputStream.
This allows us to create an AnimatedImageDrawable without fear of the
client closing the stream.

Call it from ResourcesImpl instead of Drawable.createFromResourceStream.

Change-Id: I07e00ca60c97538335a6310e830b73211fd8e7bb

6 years ago[Magnifier - 19] Add non-basic CTS tests
Mihai Popa [Tue, 30 Jan 2018 15:03:22 +0000 (15:03 +0000)]
[Magnifier - 19] Add non-basic CTS tests

This CL adds two @TestApis required for the magnifier CTS tests.

Bug: 69407609
Bug: 63531115
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I49e53223730f5fbbf353f6574429c1b1a3d877a1

6 years agoMerge changes Ie05a1759,If3b6fc63
Treehugger Robot [Tue, 6 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge changes Ie05a1759,If3b6fc63

* changes:
  Modify android.test.runner to use new mock APIs
  Add apis needed for android.test.legacy

6 years agoMerge "Revert "Fix flicker with remote animations""
TreeHugger Robot [Tue, 6 Feb 2018 14:59:51 +0000 (14:59 +0000)]
Merge "Revert "Fix flicker with remote animations""

6 years agoMerge "Disable media route scanning"
TreeHugger Robot [Tue, 6 Feb 2018 14:59:43 +0000 (14:59 +0000)]
Merge "Disable media route scanning"

6 years agoMerge "Allowing models to support multiple languages"
TreeHugger Robot [Tue, 6 Feb 2018 14:51:03 +0000 (14:51 +0000)]
Merge "Allowing models to support multiple languages"

6 years agoFix TimePicker keyboard UI num digits for min
David Ogutu [Mon, 5 Feb 2018 22:08:11 +0000 (17:08 -0500)]
Fix TimePicker keyboard UI num digits for min

Force the minutes to always format to 2 digits. This is a temporary fix
that's not quite fully Locale aware but fixes UI issue. Will need to
refactor code to seperate Locale info, share code with non-keyboard UI
and use more native Locale functions to determine number of digits.

Test: Manual https://drive.google.com/file/d/1iabh2Zzl0YRhj17gbVKr8GvVDXEHUnWI/view?usp=sharing
Bug: 72041032
Change-Id: I0eb479b9aece4726db7bf7fba04dc50ad0f175c5