OSDN Git Service
TreeHugger Robot [Tue, 8 Aug 2017 20:40:32 +0000 (20:40 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
Pavel Grafov [Tue, 8 Aug 2017 20:11:09 +0000 (20:11 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 19:49:13 +0000 (19:49 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:35:36 +0000 (19:35 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
Wei Wang [Tue, 8 Aug 2017 19:28:59 +0000 (19:28 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:27:29 +0000 (19:27 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
Makoto Onuki [Tue, 8 Aug 2017 17:24:59 +0000 (10:24 -0700)]
Don't retain a bitmap unnecessarily
Due to a limitation in the GC, LazyTaskWriterThread would always retain
the last item it processed. Extract the second half into a separate
method to clarify the scope of the variable 'item' to the GC.
Bug:
64438652
Test: Launch several apps and check with ahat
Change-Id: Ie7357927ae61a8731285d14743187a2d811fbf8c
TreeHugger Robot [Tue, 8 Aug 2017 18:23:52 +0000 (18:23 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 17:49:38 +0000 (10:49 -0700)]
Revert session-transfer change
This reverts:
5d74493f64493cd506d7458b810095259287f623
94deaf7725c418ec1950d810ab86f0d157ddf518
Bug:
64467704
Test: none, 100% revert
Change-Id: I6534c19c594dadfa41457725988485a67f0ed45f
Fyodor Kupolov [Tue, 8 Aug 2017 16:46:24 +0000 (16:46 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
Sundeep Ghuman [Mon, 7 Aug 2017 18:21:38 +0000 (11:21 -0700)]
Refactor WifiTracker sStaleScanResults.
In ag/
2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.
Bug:
63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug
Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
Todd Kennedy [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I4e0dbda0e13e5419abfa25e2719d8fdcea0fa047
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
64467610
Bug:
35929605
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 16:03:17 +0000 (16:03 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
Hugo Benichi [Tue, 8 Aug 2017 16:01:10 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: Id6040a899653c585d298b7be7208f5cba997f665
TreeHugger Robot [Tue, 8 Aug 2017 15:58:41 +0000 (15:58 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 15:52:39 +0000 (15:52 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
Todd Lee [Tue, 8 Aug 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
Kenny Guy [Tue, 8 Aug 2017 12:58:21 +0000 (12:58 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
am:
91866c65a5 -s ours
Change-Id: I40dd9ae63195b5f00741facc5b589f66513f1015
Kenny Guy [Tue, 8 Aug 2017 12:49:32 +0000 (12:49 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 11:53:46 +0000 (11:53 +0000)]
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
Adrian Roos [Tue, 8 Aug 2017 11:11:48 +0000 (11:11 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
am:
d58c6978a7
Change-Id: I077bc4252e9129960d20109920aa5783c46e0e2d
TreeHugger Robot [Tue, 8 Aug 2017 11:05:53 +0000 (11:05 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
Adrian Roos [Tue, 8 Aug 2017 10:57:18 +0000 (10:57 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
am:
6e4de6ccdf
Change-Id: I55938f50f29289e1dcc51be18561d0819caa2b9b
TreeHugger Robot [Tue, 8 Aug 2017 10:48:47 +0000 (10:48 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 10:21:15 +0000 (10:21 +0000)]
Merge "Recents scroll backwards (accessibility) if clear all button invisible" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 10:21:15 +0000 (10:21 +0000)]
Merge "Scrolling recents to next/prev page focuses next/prev node" into oc-mr1-dev
Narayan Kamath [Tue, 8 Aug 2017 09:09:27 +0000 (09:09 +0000)]
Merge "system_server : trigger runtime restart when we're close to the soft FD limit." into oc-mr1-dev
fionaxu [Tue, 8 Aug 2017 09:02:23 +0000 (09:02 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
am:
93bf6200eb
Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
TreeHugger Robot [Tue, 8 Aug 2017 08:57:16 +0000 (08:57 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
Wei Wang [Mon, 7 Aug 2017 22:35:13 +0000 (15:35 -0700)]
Shutdown: Continue shutdown with BLE only mode
Bug:
64213593
Test: shutdown no timeout
Change-Id: I5007e7cfc00ab22fce3b6ef13bacbcc951197b9e
TreeHugger Robot [Tue, 8 Aug 2017 06:18:56 +0000 (06:18 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 06:03:18 +0000 (06:03 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 01:15:41 +0000 (01:15 +0000)]
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:45:48 +0000 (00:45 +0000)]
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
* changes:
Allow to read all params used to create session.
Allow to transfer+seal a install session
Matthew Ng [Tue, 8 Aug 2017 00:39:26 +0000 (00:39 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
am:
673e3c41ec
Change-Id: Iedcf8f27eacdba8ad96a4753fb108f4539930fb9
Matthew Ng [Tue, 8 Aug 2017 00:38:32 +0000 (00:38 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am:
c7d24aed82
Change-Id: I96ed9a5f7f295b1a3f3a9199547945e4958a34a3
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:35:09 +0000 (00:35 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
Hugo Benichi [Mon, 7 Aug 2017 06:47:35 +0000 (15:47 +0900)]
NetworkStats: more robust subtraction for deltas
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.
When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.
This is what's expected by NetworkStatsHistory#recordData().
Bug:
64365917
Test: runtest frameworks-net
Change-Id: I16e97e73f600225f80e0ce517e80c07c6f399196
Calin Juravle [Tue, 8 Aug 2017 00:17:44 +0000 (00:17 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:35:56 +0000 (23:35 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
Sudheer Shanka [Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:28:50 +0000 (23:28 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:22:31 +0000 (23:22 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
Todd Poynor [Fri, 26 May 2017 00:53:21 +0000 (17:53 -0700)]
thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.
Test: manual: marlin with modified thermal-engine.conf and temporary
java thermal event listener
Bug:
30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit
dd05582eabb6809899e3187d3afc1e97e148fdb1)
Yohei Yukawa [Mon, 7 Aug 2017 22:34:51 +0000 (22:34 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:21:08 +0000 (22:21 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I9ce5cf5aea7f0fd93fbe24664bbd583d5057d3e6
TreeHugger Robot [Mon, 7 Aug 2017 22:18:11 +0000 (22:18 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 22:17:50 +0000 (22:17 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
Matthew Ng [Thu, 3 Aug 2017 00:28:02 +0000 (17:28 -0700)]
Scrolling recents to next/prev page focuses next/prev node
Recents did not report that it finished scrolling to Talkback so it did
not focus the next item. Now sending the accessibility event when
scrolling will focus the next node.
Test: talkback on, open recents with tons of apps, scroll to bottom app,
keep swiping left until multiple tasks move down
Bug:
37005488
Change-Id: I07e8d686e7cc0f1a43f13769181d4c7cb87853e8
TreeHugger Robot [Mon, 7 Aug 2017 21:20:54 +0000 (21:20 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
TreeHugger Robot [Mon, 7 Aug 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Takashi Furukawa [Wed, 12 Jul 2017 07:32:01 +0000 (16:32 +0900)]
Cherry-pick: Add null check for Wi-Fi command
When WifiService is not ready during boot phase and Wi-Fi command
is executed on console, NullPointerException happens.
To prevent this, null check is needed.
Test: Manual test
Bug:
64040515
Change-Id: I5684cdc7661b7d93fd6f2ac61863919077d12935
Merged-In: I5684cdc7661b7d93fd6f2ac61863919077d12935
Peter Qiu [Mon, 7 Aug 2017 20:12:05 +0000 (20:12 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:06:20 +0000 (20:06 +0000)]
Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"
This reverts commit
84933321668c79202de39ea491329f7234ce6ee5.
Change-Id: Ibecf24689952d4888269863ff02d8c97e14a0c31
Todd Lee [Mon, 10 Jul 2017 16:41:53 +0000 (09:41 -0700)]
Device Default theming updates for Wear
- aligning styled attributes with those defined in O RC
- reduce coupling to/mutation of the material theme
- includes all previously customized values (i.e. WTS neutral)
Test: should be no visible difference (changes are focused
on simplifying resources and their inheritance via theme
definitions, as well as explicitly defining additional
resources not currently used in the application layer).
WTS OemColorsTest should pass:
run wts --module WtsOemConfigDeviceTestCases
(no failure on colors... doesn't mean no failures)
Bug:b/
63525308
Change-Id: I5c3c3b848e0090169b884ec005113aeac2560993
Adrian Roos [Mon, 7 Aug 2017 18:41:04 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: I2956ecaff7b471af05e9baa275d7ea0742bfb4eb
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
TreeHugger Robot [Mon, 7 Aug 2017 18:19:59 +0000 (18:19 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Fyodor Kupolov [Fri, 4 Aug 2017 00:56:44 +0000 (17:56 -0700)]
API Review update for SQLiteDatabase
SQLiteDatabase openDatabase -- should take File for first parameter
instead of a String path
SQLiteDatabase.OpenParams.Builder -- make sure the javadocs says what
the default openFlags is and default idle connection timeout
SQLiteDatabase createInMemory -- throw if it has trouble instead of
returning null.
Test: cts/SQLiteDatabaseTest
Bug:
64331777
Bug:
64331778
Bug:
64330914
Change-Id: Ibecf4f4a6498795f9a5d12b94b77481e5745b523
Philip P. Moltmann [Thu, 3 Aug 2017 21:35:56 +0000 (14:35 -0700)]
Allow to read all params used to create session.
So that they can be verified by the app calling commit().
This really only makes sense if the app calling commit is different from
the app that created the session.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Change-Id: I5c954ca59b7582555bea847f3ddbba0aeefba301
Philip P. Moltmann [Wed, 19 Jul 2017 17:06:14 +0000 (10:06 -0700)]
Allow to transfer+seal a install session
... so that one package can supply the data and another one can issue
the commit.
Also allow reading of sealed sessions.
Also lock more in PackageInstallerSession so that we can be sure the
session is not used by the old package anymore once transferred and that
all calls into the session work on consistent data.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Installed and uninstalled packages via the Google Play Store
Change-Id: Id4b7a0071d703b7d18c9f5bf2bd15ebf67086d07
Adam Lesinski [Mon, 7 Aug 2017 17:43:08 +0000 (17:43 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am:
242c22c900
Change-Id: I8be36dcf67b6d32f69fbefdf2bd78e04034f6bb8
TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 17:32:45 +0000 (19:32 +0200)]
AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f
Address reviewer's requests on I0fa53616db09be98d33ea7d06b38d8ff3037707f.
Bug:
64287908
Test: make SystemUI
Change-Id: I804c9408742cc5bd1d69fd5fd8ad42074953b0f6
Tomasz Wasilczyk [Fri, 4 Aug 2017 19:56:47 +0000 (12:56 -0700)]
Change VENDOR program types to range.
Bug: b/
64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
Ecco Park [Mon, 7 Aug 2017 17:18:55 +0000 (17:18 +0000)]
Location: adding NULL check for the LPP_PROFILE property
am:
8eec744ccb
Change-Id: Ia72f80b5d809190c7e2f733c8e59bf989f826973
Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]
Location: adding NULL check for the LPP_PROFILE property
Bug:
35485906
Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
Jonathan Basseri [Mon, 7 Aug 2017 16:24:31 +0000 (16:24 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am:
35a563ef62
Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 16:18:37 +0000 (16:18 +0000)]
Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
Adrian Roos [Sun, 23 Jul 2017 12:35:59 +0000 (14:35 +0200)]
FRP: Enable credential-based factory reset protection by default
Bug:
64436700
Change-Id: I3aed6313e3b6b7e6d6e65c9e822ff123b8cd52cd
Test: Set up PIN, add Google Account, adb shell reboot-bootloader; fastboot -w; verify credential-based unlocking is possible using the PIN from before factory reset
Narayan Kamath [Mon, 31 Jul 2017 14:58:59 +0000 (15:58 +0100)]
system_server : trigger runtime restart when we're close to the soft FD limit.
We arbitrarily define a high water mark as 12 below the max limit (1024)
and dump the list of open descriptors and restart the system_server when we
reach that mark.
The list of file descriptors is dumped to a file with prefix /data/anr/anr_fd_xxxxx.
This might be construed as a hack, but it allows us to take advantage of
existing code in dumpstate that will capture this file and add it to any
bugreport that's collected after.
Test: Manual
Bug:
63004717
Change-Id: I4052625574a3ab2df9ddf591f281a412e7b4b511
Adrian Roos [Mon, 7 Aug 2017 14:55:46 +0000 (16:55 +0200)]
ScrimController: Wait with clearing wakup animation until done
Fixes an issue where if another animation was started during
the wakeupFromDoze animation, the scrim would flash white
because the original animation got canceled. Instead now wait
until the animation is actually completed, not just altered.
Change-Id: I7738ec838d77f78dde2c5810369c50b4fafaeb67
Fixes:
64412754
Test: Trigger assistant from AOD; verify there is no white flash.
Adrian Roos [Mon, 7 Aug 2017 13:52:26 +0000 (15:52 +0200)]
AOD: Fix shelf animating when it should not
Fixes an issue where the shelf would animate downwards when going to AOD.
The issue is that setDark gets called in updateIsKeyguard even though nothing changed,
yet it still re-requests the dark transition. Consequently, when the keyguard goes dark
later, the requested transition executes and moves the shelf downwards.
Change-Id: I8c590aeb4f330d8c3c1b51285d899d5f6db36323
Fixes:
64412244
Test: Double tap on notification on AOD2; press power; verify shelf does not move downwards
Adrian Roos [Mon, 7 Aug 2017 13:48:46 +0000 (13:48 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
am:
9f3bac52ee
Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718
TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am:
81e3b48f9c
Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00
TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:34:41 +0000 (12:34 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am:
9aa43e6320
Change-Id: I0889a00cbdc54d401484391d66e0dd06ac92fd71
Jorim Jaggi [Mon, 7 Aug 2017 12:27:53 +0000 (12:27 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
am:
997f2f71fa
Change-Id: I8b5fb57655afe1b9cab6afe3f5f34d48413af062
Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
Martijn Coenen [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
am:
4499576db0 -s ours
Change-Id: I6119b3e45a4b104aa9a7cbad576a6b3d8a273ca4
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
Robert Carr [Mon, 7 Aug 2017 10:49:05 +0000 (10:49 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am:
17844f2257
Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 06:01:02 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:49:25 +0000 (05:49 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am:
1b3877a965
Change-Id: I50748aa0c9332787797f91265afccf82ceabf332
Hugo Benichi [Mon, 7 Aug 2017 05:42:48 +0000 (05:42 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
Sungsoo Lim [Mon, 7 Aug 2017 01:40:01 +0000 (10:40 +0900)]
Start ARC action when setSystemAudioMode
Bug:
32862965
Test: manual
Change-Id: I6cf30c48649572fa045b734a5c01cf2dc219adc3
Pankaj Kanwar [Sun, 6 Aug 2017 18:58:41 +0000 (18:58 +0000)]
Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 17:26:43 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev