OSDN Git Service
TreeHugger Robot [Tue, 6 Feb 2018 23:43:42 +0000 (23:43 +0000)]
Merge "remove unused/deprecated flags from savelayer"
Selim Cinek [Tue, 6 Feb 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fixed 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
TreeHugger Robot [Tue, 6 Feb 2018 23:18:13 +0000 (23:18 +0000)]
Merge "Increase instant app privacy with dummy data"
Selim Cinek [Tue, 6 Feb 2018 23:15:00 +0000 (23:15 +0000)]
Merge "Implemented support for inline images"
TreeHugger Robot [Tue, 6 Feb 2018 23:05:08 +0000 (23:05 +0000)]
Merge "Add logging for output chooser."
TreeHugger Robot [Tue, 6 Feb 2018 22:47:46 +0000 (22:47 +0000)]
Merge "Use new minikin::Font constructor"
TreeHugger Robot [Tue, 6 Feb 2018 22:45:40 +0000 (22:45 +0000)]
Merge "Revert "Remove @hide from ViewGroup debug methods""
Steven Moreland [Tue, 6 Feb 2018 22:45:11 +0000 (22:45 +0000)]
Merge "Remove unused flags from IHwBinder."
TreeHugger Robot [Tue, 6 Feb 2018 21:49:33 +0000 (21:49 +0000)]
Merge "Fix small issues with event flow for quickscrub"
Lucas Dupin [Tue, 6 Feb 2018 21:49:13 +0000 (21:49 +0000)]
Merge "Fix issue where pulse callback would be delayed"
TreeHugger Robot [Tue, 6 Feb 2018 21:42:48 +0000 (21:42 +0000)]
Merge "puller cache clearing"
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."
Mike Reed [Tue, 6 Feb 2018 21:18:07 +0000 (16:18 -0500)]
remove unused/deprecated flags from savelayer
Test: make
Change-Id: I39e41a80430dca7878e6983b098c1c4541904fd1
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
TreeHugger Robot [Tue, 6 Feb 2018 21:07:29 +0000 (21:07 +0000)]
Merge "Don't change stream volume on mute"
TreeHugger Robot [Tue, 6 Feb 2018 20:29:23 +0000 (20:29 +0000)]
Merge "Add privacy tags to print dumping"
TreeHugger Robot [Tue, 6 Feb 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Fixes crash when pinning unfocused task in multiwindow"
TreeHugger Robot [Tue, 6 Feb 2018 20:13:19 +0000 (20:13 +0000)]
Merge "Add metrics constants for new settings screens."
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"
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
TreeHugger Robot [Tue, 6 Feb 2018 19:45:37 +0000 (19:45 +0000)]
Merge "Revert "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset.""
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
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"
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
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
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.
TreeHugger Robot [Tue, 6 Feb 2018 18:53:33 +0000 (18:53 +0000)]
Merge "[Magnifier - 19] Add non-basic CTS tests"
TreeHugger Robot [Tue, 6 Feb 2018 18:34:40 +0000 (18:34 +0000)]
Merge "Call ImageDecoder directly in ResourcesImpl"
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>
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
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
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
TreeHugger Robot [Tue, 6 Feb 2018 18:03:41 +0000 (18:03 +0000)]
Merge "Ignore QS touches if scrolling is not possible."
TreeHugger Robot [Tue, 6 Feb 2018 18:02:36 +0000 (18:02 +0000)]
Merge "Improved logging on Autofill Save."
TreeHugger Robot [Tue, 6 Feb 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Isolate print out of process test from other tests"
TreeHugger Robot [Tue, 6 Feb 2018 17:35:03 +0000 (17:35 +0000)]
Merge "Removes instant app visibility metadata check"
Makoto Onuki [Tue, 6 Feb 2018 17:27:29 +0000 (17:27 +0000)]
Merge "Don't take a lock on the UI thread"
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
Makoto Onuki [Tue, 6 Feb 2018 17:14:06 +0000 (17:14 +0000)]
Merge "Disable sync job service WTF for now."
Vladislav Kuzkokov [Tue, 6 Feb 2018 17:11:07 +0000 (17:11 +0000)]
Merge "Make printing policy a restriction."
TreeHugger Robot [Tue, 6 Feb 2018 17:09:33 +0000 (17:09 +0000)]
Merge "Adding warning text to dnd dialog"
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
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"
TreeHugger Robot [Tue, 6 Feb 2018 16:47:22 +0000 (16:47 +0000)]
Merge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"
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
Beverly Tai [Tue, 6 Feb 2018 16:29:09 +0000 (16:29 +0000)]
Merge "Wireless charging sound used for wired charging"
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
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
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
TreeHugger Robot [Tue, 6 Feb 2018 15:52:53 +0000 (15:52 +0000)]
Merge "Fix TimePicker keyboard UI num digits for min"
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
Paul Duffin [Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)]
Merge changes Ie05a1759,If3b6fc63 am:
1f14eab551
am:
73771adf83
Change-Id: Iadca3cac054e707d193a7d054d091a13c78e0cbe
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
Paul Duffin [Tue, 6 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge changes Ie05a1759,If3b6fc63
am:
1f14eab551
Change-Id: I259f07c37e2797f07b9bfdc13f5ebc0d05429877
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
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
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
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
TreeHugger Robot [Tue, 6 Feb 2018 14:59:51 +0000 (14:59 +0000)]
Merge "Revert "Fix flicker with remote animations""
TreeHugger Robot [Tue, 6 Feb 2018 14:59:43 +0000 (14:59 +0000)]
Merge "Disable media route scanning"
TreeHugger Robot [Tue, 6 Feb 2018 14:51:03 +0000 (14:51 +0000)]
Merge "Allowing models to support multiple languages"
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
Julia Reynolds [Tue, 6 Feb 2018 13:46:31 +0000 (13:46 +0000)]
Merge "Grant uri access to notification listeners."
Paul Duffin [Tue, 6 Feb 2018 13:39:46 +0000 (13:39 +0000)]
Merge "Correct inaccurate comments in build files"
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.
This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
20af1df63f77f6b3ab12fd6221f581fe84182091)
Merged-In: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Change-Id: Ie05a17598fcabc1189cacc912c01a25782ebd29c
Paul Duffin [Wed, 31 Jan 2018 13:30:22 +0000 (13:30 +0000)]
Correct inaccurate comments in build files
Bug:
30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
772b6923206a34e97c45bc48e7ad4bebfd3eae29)
Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
Wale Ogunwale [Tue, 6 Feb 2018 13:03:34 +0000 (13:03 +0000)]
Revert "Fix flicker with remote animations"
This reverts commit
ab09e6472fc175077561cd55f2c1aa1d57683c9e as it causes crash.
Change-Id: I2878cebca7d63a95545cc50e775a183527d7c2c2
bug:
72953020
TreeHugger Robot [Tue, 6 Feb 2018 11:53:16 +0000 (11:53 +0000)]
Merge "BatteryStats: Fix bogus calls to addHistoryRecordLocked."
TreeHugger Robot [Tue, 6 Feb 2018 11:01:53 +0000 (11:01 +0000)]
Merge "Make phone number actions dependent on user privileges"
Jan Althaus [Mon, 29 Jan 2018 18:28:41 +0000 (19:28 +0100)]
Allowing models to support multiple languages
Note that there are edge cases where this diverges from O behaviour.
Specifically in the case where there is a more specific factory than
update model.
For example: system language is "en-us", factory model is v3 "en-us",
update model is v4 "en". In O, we would have selected the factory model,
now we select the update one.
This also fixes a bug that caused model versions to not get logged.
Test: Ran framework core tests, and tested manually.
Bug:
72427364
Change-Id: Ied35335512563e2cbaaeb5790b425b1e9fffbaa8
TreeHugger Robot [Tue, 6 Feb 2018 10:24:16 +0000 (10:24 +0000)]
Merge "Dump autofill compat packages."
Andreas Gampe [Tue, 6 Feb 2018 09:29:10 +0000 (09:29 +0000)]
Merge "Frameworks: Mark tests" am:
c86b195cd5 am:
2b12970061
am:
70c15d1d8d
Change-Id: I55b62b64236937c66a21ec667216f7f1d505a5b5
Andreas Gampe [Tue, 6 Feb 2018 09:14:05 +0000 (09:14 +0000)]
Merge "Frameworks: Mark tests" am:
c86b195cd5
am:
2b12970061
Change-Id: I73c717b99b9660a11141b5392c6993ab9aabf85c
Andreas Gampe [Tue, 6 Feb 2018 09:04:38 +0000 (09:04 +0000)]
Merge "Frameworks: Mark tests"
am:
c86b195cd5
Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2
TreeHugger Robot [Tue, 6 Feb 2018 08:32:30 +0000 (08:32 +0000)]
Merge "Ignore more yellows and greens"
TreeHugger Robot [Tue, 6 Feb 2018 07:05:36 +0000 (07:05 +0000)]
Merge "Change enum MustExist in CertUtils to IntDef integers"
TreeHugger Robot [Tue, 6 Feb 2018 06:54:34 +0000 (06:54 +0000)]
Merge "Revert "Use the correct prebuilts for lifecycles.""
Lucas Dupin [Tue, 6 Feb 2018 05:16:39 +0000 (21:16 -0800)]
Fix issue where pulse callback would be delayed
Test: double tap device with LCD display, press power, repeat
Test: double tap device with OLED display, press power, repeat
Fixes:
69935953
Fixes:
72959137
Change-Id: I12f53bfc4646f6a247c66771d2a4a24675430057
TreeHugger Robot [Tue, 6 Feb 2018 06:16:10 +0000 (06:16 +0000)]
Merge "Partial buckets on app upgrade and fix duration."
Treehugger Robot [Tue, 6 Feb 2018 06:03:09 +0000 (06:03 +0000)]
Merge "Frameworks: Mark tests"
Adam Lesinski [Tue, 6 Feb 2018 05:21:51 +0000 (05:21 +0000)]
Merge "OMS: handle overlay package upgrades, uninstalls"
Pankaj Kanwar [Tue, 6 Feb 2018 05:13:23 +0000 (05:13 +0000)]
Merge "Fix the function to get baseband version correctly in telephony manager."
Android Build Merger (Role) [Tue, 6 Feb 2018 04:23:20 +0000 (04:23 +0000)]
Merge "Merge "Add function to change LE Tx Data Length" am:
383a7d432f am:
cffe307fa5 am:
3a19b325c1"
Stanley Tng [Tue, 6 Feb 2018 04:18:57 +0000 (04:18 +0000)]
Merge "Add function to change LE Tx Data Length" am:
383a7d432f am:
cffe307fa5
am:
3a19b325c1
Change-Id: I717bfaa6fa452be311b493199dfc59a9124a73f0
Hans Boehm [Tue, 6 Feb 2018 04:15:56 +0000 (04:15 +0000)]
Merge "Increase CRASH_AT_SIZE to 20000"
TreeHugger Robot [Tue, 6 Feb 2018 03:50:54 +0000 (03:50 +0000)]
Merge "Refactored out app standby bucket reordering"
Android Build Merger (Role) [Tue, 6 Feb 2018 03:50:18 +0000 (03:50 +0000)]
Merge changes from topic "am-
f03a20d785824cb5973391e78d6c1eb2"
* changes:
Merge changes from topic "ims_apis" am:
de65acb915 am:
77230a0b3f am:
83d77063a8 -s ours
Make ImsService API @SystemApi am:
0e370b4a02 am:
a690700bca am:
ade4691364 -s ours
Integrate new MMTel APIs into the framework am:
5b1883b5f1 am:
e904f40820 am:
a210f34020 -s ours
Integrate ImsCallSessionListener API changes am:
6ed4ee6847 am:
d627bb5039 am:
2c5dc6b6a0 -s ours
Brad Ebinger [Tue, 6 Feb 2018 03:46:05 +0000 (03:46 +0000)]
Merge changes from topic "ims_apis" am:
de65acb915 am:
77230a0b3f
am:
83d77063a8 -s ours
Change-Id: I9f26d74bcc5786bc368b9b9626ab77adf0b3b0e4
Brad Ebinger [Tue, 6 Feb 2018 03:39:27 +0000 (03:39 +0000)]
Make ImsService API @SystemApi am:
0e370b4a02 am:
a690700bca
am:
ade4691364 -s ours
Change-Id: I25257302d183d00cdc092c6e89196722acba56ab
Brad Ebinger [Tue, 6 Feb 2018 03:34:13 +0000 (03:34 +0000)]
Integrate new MMTel APIs into the framework am:
5b1883b5f1 am:
e904f40820
am:
a210f34020 -s ours
Change-Id: I06a45a0a21300af17c2685e87970a64a876f317b
TreeHugger Robot [Tue, 6 Feb 2018 03:33:47 +0000 (03:33 +0000)]
Merge "Wait for target package MessageQueue empty before continuing"
Brad Ebinger [Tue, 6 Feb 2018 03:28:50 +0000 (03:28 +0000)]
Integrate ImsCallSessionListener API changes am:
6ed4ee6847 am:
d627bb5039
am:
2c5dc6b6a0 -s ours
Change-Id: Ie435cabd7ac4976110d1e45ac55d33b79f9adaf5
Stanley Tng [Tue, 6 Feb 2018 03:27:07 +0000 (03:27 +0000)]
Merge "Add function to change LE Tx Data Length" am:
383a7d432f
am:
cffe307fa5
Change-Id: I02a15bfc36d8c8817c45e4c6f56ebbfbbf571338
Mårten Kongstad [Wed, 10 Jan 2018 11:05:26 +0000 (12:05 +0100)]
OMS: handle overlay package upgrades, uninstalls
Teach the overlay manager about upgrades and uninstalls of overlay
packages. Add two transient overlay states STATE_TARGET_UPGRADING and
STATE_OVERLAY_UPGRADING.
Test: atest OverlayHostTests
Change-Id: I2d04204150f9e749f070b4e4363eacbd59355014
Jean-Michel Trivi [Tue, 6 Feb 2018 03:24:40 +0000 (03:24 +0000)]
Merge "Synchronous audio focus behavior with external focus policy"
Ian Pedowitz [Tue, 6 Feb 2018 03:07:12 +0000 (03:07 +0000)]
Revert "Use the correct prebuilts for lifecycles."
This reverts commit
8c61d7b4b9dd6de37a7acc14f91f8a71623edcc1.
Reason for revert: b/
72969557
Bug:
72969557
Bug:
72566647
Change-Id: I46bebf253f1dcb5abfdff2f56022675c1dd44219
Brad Ebinger [Tue, 6 Feb 2018 03:16:39 +0000 (03:16 +0000)]
Merge changes from topic "ims_apis" am:
de65acb915
am:
77230a0b3f
Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72
TreeHugger Robot [Tue, 6 Feb 2018 03:12:23 +0000 (03:12 +0000)]
Merge "Add new InputBindResult.ResultCode for no editor"