OSDN Git Service
Pavel Grafov [Wed, 9 Aug 2017 13:22:29 +0000 (13:22 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
am:
56385a796e -s ours
Change-Id: I8214883676ad022933becca76a704340558abcb1
Erik Kline [Wed, 9 Aug 2017 13:17:25 +0000 (13:17 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
am:
07df171ac6
Change-Id: I5958635d612a2c23e8d96e38e75eff2f29ff5e28
yinxu [Wed, 9 Aug 2017 13:15:12 +0000 (13:15 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
am:
669f560338
Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68
Geoffrey Pitsch [Wed, 9 Aug 2017 13:10:55 +0000 (13:10 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
am:
a68ecbfdee
Change-Id: Id98f4e550b90c128765c0ca014eda925b3507110
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:21 +0000 (13:06 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
am:
3108a06656
Change-Id: Ic37ee35914b714144228b77b192edf835bf9627e
Lucas Dupin [Wed, 9 Aug 2017 13:03:29 +0000 (13:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
am:
4cef646e6a
Change-Id: Ic5b812965d239de88c98beab411ea5752ec38252
Andrii Kulian [Wed, 9 Aug 2017 12:59:51 +0000 (12:59 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
am:
75176be75a
Change-Id: I7c018b5eadc66db0d91542e089899123a85a8877
Glen Kuhne [Wed, 9 Aug 2017 12:56:05 +0000 (12:56 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
am:
3edc463902
Change-Id: I575446562bfb560ace060300afb828fc52c4201d
Wei Wang [Wed, 9 Aug 2017 12:53:13 +0000 (12:53 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
am:
043e60f5e4
Change-Id: I51722b281ab9badaefd705500aa9a36d2e2d6f91
Jason Monk [Wed, 9 Aug 2017 12:47:07 +0000 (12:47 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev
am:
127a4c9014
Change-Id: I943db8a557e311d845b9550a52dda8d286864cf6
Sundeep Ghuman [Wed, 9 Aug 2017 12:41:25 +0000 (12:41 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
am:
e14d59a656 -s ours
Change-Id: I18e7f77e4a58ed8abe288aa04b762d112ae495b2
Andrii Kulian [Wed, 9 Aug 2017 12:38:54 +0000 (12:38 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev
am:
425784eef2
Change-Id: I2a5acd51bd9ea588823844cd6a49716181e717a9
Dan Sandler [Wed, 9 Aug 2017 12:33:07 +0000 (12:33 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev
am:
ad75ef4c3b
Change-Id: I53055ed426d65a6214d19ef11b6f6540c7f6d94c
Felipe Leme [Wed, 9 Aug 2017 12:30:16 +0000 (12:30 +0000)]
Clarifies autofill lifecycle. am:
744976e298
am:
af40bb0dc4
Change-Id: I48f797f62c120b352045cb93e5067ee20c3154d3
Jason Monk [Wed, 9 Aug 2017 12:15:19 +0000 (12:15 +0000)]
Merge "resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 10:17:09 +0000 (10:17 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 09:54:22 +0000 (09:54 +0000)]
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 09:19:15 +0000 (09:19 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
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:
35929605
Bug:
64467610
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Merged-In: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Sudheer Shanka [Wed, 9 Aug 2017 05:38:18 +0000 (05:38 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 04:42:05 +0000 (04:42 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev
Erik Kline [Wed, 9 Aug 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
Nate Fischer [Wed, 9 Aug 2017 02:52:53 +0000 (02:52 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev
Calin Juravle [Wed, 9 Aug 2017 01:35:23 +0000 (01:35 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 01:10:03 +0000 (01:10 +0000)]
Merge "Intern process names." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 01:01:11 +0000 (01:01 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
* changes:
Allow to close session from wrong context.
Prevent closing by prev owner after transfer.
Revert "Revert session-transfer change"
TreeHugger Robot [Wed, 9 Aug 2017 00:41:25 +0000 (00:41 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:28:50 +0000 (00:28 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:22:01 +0000 (00:22 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:00:27 +0000 (00:00 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 23:33:03 +0000 (23:33 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
Lucas Dupin [Tue, 8 Aug 2017 23:03:31 +0000 (23:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:55:33 +0000 (22:55 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
Sudheer Shanka [Tue, 8 Aug 2017 22:44:09 +0000 (15:44 -0700)]
Change logging format in KernelUidCpuFreqTimeReader.
TimeUtils.formatForLogging takes currentTimeMillis as
argument, not elapsedRealTime.
Bug:
63041570
Test: visual inspection of logs
Change-Id: I4b880f64a8ead9a6a4a37fa4b9691edfc38a12db
TreeHugger Robot [Tue, 8 Aug 2017 22:46:50 +0000 (22:46 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
Nate Fischer [Thu, 27 Jul 2017 19:33:55 +0000 (12:33 -0700)]
WebView: fix SafeBrowsingResponse javadocs
Docs change only.
This fixes javadoc errors in SafeBrowsingResponse.java:
* Typo: capital "B" in "onSafeBrowsingHit"
* Add full package names
* Add parameter lists to all linked methods
Bug:
64077668
Test: make update-api and check javadocs manually
Change-Id: I5e7b0e59ba865619b252f7e9e431ffac6e1bab1f
TreeHugger Robot [Tue, 8 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
Calin Juravle [Mon, 7 Aug 2017 02:20:19 +0000 (19:20 -0700)]
Add package use info to dexopt dump
Bug:
64153885
Test: adb shell dumpsys package dexopt
Change-Id: I57768076de821980b1de84d5fe44ab642ceebeba
Calin Juravle [Tue, 8 Aug 2017 22:19:32 +0000 (22:19 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev
* changes:
Record usage information per split
Use PackageUseInfo in DexOptimizer
TreeHugger Robot [Tue, 8 Aug 2017 22:13:11 +0000 (22:13 +0000)]
Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev
Makoto Onuki [Mon, 7 Aug 2017 16:58:23 +0000 (09:58 -0700)]
Intern process names.
Bug:
62144301
Test: Boot and start random apps on a secondary user
Change-Id: I8a9b475410c52e1063cff5519b0297ad69dd7925
Yohei Yukawa [Tue, 8 Aug 2017 21:54:13 +0000 (21:54 +0000)]
Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev
* changes:
Fix system restart due to race in TSMS
Remove redundant synchonized blocks from TSMS
TreeHugger Robot [Tue, 8 Aug 2017 21:36:39 +0000 (21:36 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 21:23:27 +0000 (21:23 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 21:19:41 +0000 (21:19 +0000)]
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
Nate Fischer [Tue, 8 Aug 2017 21:00:59 +0000 (21:00 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
Andrew Sapperstein [Tue, 8 Aug 2017 02:09:41 +0000 (19:09 -0700)]
Make accessibilityInversionEnabled public
Need to use it in Settings.
Bug:
64256644
Test: existing
Change-Id: I9f9d2655e35ee2ad0dc9f9980cc9993f7b084025
Todd Kennedy [Tue, 1 Aug 2017 14:42:47 +0000 (07:42 -0700)]
Add virtual preload bit to ApplicationInfo
Change-Id: I2735b3823a8709b2ffb65cc8085ffcd952d3e1f2
Fixes:
64205417
Test: Manual
Test: Create a sample app and install it as a normal app
Test: See that it returns 'false' for "isVirtualPreload"
Test: Create a sample app and install it as a virtual preload ["--preload"]
Test: See that it returns 'true' for "isVirtualPreload"
Test: Run sample apps after reboot and see they return the correct value
TreeHugger Robot [Tue, 8 Aug 2017 20:40:32 +0000 (20:40 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-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
(cherry picked from commit
4d282544c3ebf5ade44d56963c23a474916e61ba)
Jason Monk [Tue, 8 Aug 2017 20:27:14 +0000 (16:27 -0400)]
resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3f5eb2a0481fb09b98c0c522c82c233350c06375
Philip P. Moltmann [Tue, 8 Aug 2017 17:44:34 +0000 (10:44 -0700)]
Allow to close session from wrong context.
commitLocked runs on a handler, thereby as system. It will call close()
if the package installer is popped-up to confirm the installation. Hence
we have to allow this use case without checking the caller.
Bug:
64467704
Test: gts-tradefed run singleCommand gts -m GtsPackageInstallSessionTestCases
Change-Id: I0bd0329c0485c50afa459d90c3372d7bf7408287
Philip P. Moltmann [Tue, 8 Aug 2017 16:19:23 +0000 (09:19 -0700)]
Prevent closing by prev owner after transfer.
Bug:
64467704
Test: gts-tradefed run singleCommand gts -m GtsPackageInstallSessionTestCases
Change-Id: I81fb1b641295cbb9e36504eb3e40f51ce6b2de94
Philip P. Moltmann [Tue, 8 Aug 2017 20:07:11 +0000 (20:07 +0000)]
Revert "Revert session-transfer change"
This reverts commit
9890f8b426550485aaab164a7bedbcd545862b85.
Bug:
64467704
Test: cts-tradefed run singleCommand cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionParamsUnitTest
cts-tradefed run singleCommand cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Change-Id: I0cc7e1129d85e4d0de16ade44232a9bd381d6c04
Andrii Kulian [Tue, 8 Aug 2017 20:16:06 +0000 (20:16 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-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
Andrii Kulian [Mon, 7 Aug 2017 22:53:44 +0000 (15:53 -0700)]
Round animation progress for computing size for background
Round background crop animation progress when it's less then
epsilon to match fullscreen size and eliminate a line of couple
pixels high bleeding through from an app underneath. This
happens when animating letterboxed app from recents and can
be visible at the end of animation below nav bar.
Bug:
63156733
Bug:
62893418
Test: go/wm-smoke
Test: Trigger animations to/from recents with different rotations.
Change-Id: Ia4e93c81eac93a886007d53da3a685a69d4cb4de
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
Kevin Chyn [Tue, 8 Aug 2017 19:24:34 +0000 (12:24 -0700)]
Fix fingerprint onEnumerationResult to use remaining instead of fid
Fixes:
64087535
Test: make -j56, this code isn't used until we figure when to do
b/
63606218
Change-Id: I4c8804e71695ffc46e9b70c7f623e14e420f6242
Calin Juravle [Fri, 4 Aug 2017 08:42:17 +0000 (01:42 -0700)]
Record usage information per split
Increase the granularity of usage information to store data on each split
separately.
Now, splits get their own useByOtherApps flag and can be compiled
speed-profile when only the primary apk is loaded by other apps.
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Change-Id: Ibf9e7b9e67db9c6f0f45dc695bce8fbeb7be20ae
Calin Juravle [Fri, 4 Aug 2017 02:48:37 +0000 (19:48 -0700)]
Use PackageUseInfo in DexOptimizer
Pass the PackageUseInfo directly to DexOptimizer and use it to detect if a
package is used by other apps. Move the usage checks closer to dexopt so
that they can be easily adapted when we add usage info for each of the
app's code paths separately.
This is a refactoring CLs to reduce the size and complexity of the
upcoming CLs which record the usage info for each of the application
splits.
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Change-Id: I8031590cdaff81ab1792ca19baddb6cb36dc021d
Kevin Chyn [Tue, 8 Aug 2017 18:58:58 +0000 (11:58 -0700)]
Update FINGERPRINT_ERROR_LOCKOUT documentation
Fixes:
64330785
Test: make -j56
Change-Id: I40f0e71b9fd7dcdd12340bc03bb077e56813f5b7
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
TreeHugger Robot [Tue, 8 Aug 2017 17:59:12 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev
Felipe Leme [Tue, 8 Aug 2017 17:34:14 +0000 (17:34 +0000)]
Clarifies autofill lifecycle.
am:
744976e298
Change-Id: Ia1c9652ded5c5ea6af9dc7872f89bd776a58e6d4
Adrian Roos [Tue, 8 Aug 2017 16:32:03 +0000 (18:32 +0200)]
FRP: Use verifyChallenge instead of verify
Otherwise the gatekeeper payload is null, which we treat as an error.
Change-Id: I56035195fe249df15f6fe699718f41b69de5ba37
Fixes:
64478778
Test: Try to use FRP credential; verify it works.
Jason Monk [Tue, 8 Aug 2017 16:49:25 +0000 (16:49 +0000)]
Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev
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
Merged-In: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
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
Jason Monk [Tue, 8 Aug 2017 15:19:26 +0000 (11:19 -0400)]
Fade in rounded corners to avoid abrupt change
Test: visual
Change-Id: Ie19b732cc09b87f0d0387e249c772c9986ed0aaf
Fixes:
64384961
Jason Monk [Fri, 4 Aug 2017 17:39:17 +0000 (13:39 -0400)]
Move shutdown UI to sysui (when possible)
Test: click restart or power off in global actions
Change-Id: I0dc30a9772bbfb3cd3c3568f157e854fef87bf87
Fixes:
63576195
Fixes:
64125291
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
Adrian Roos [Tue, 8 Aug 2017 11:08:01 +0000 (13:08 +0200)]
FRP: Fix crash after lockout
Change-Id: Ie8cd85c6afd61a03dfe730432702c11c29c11cce
Fixes:
37746493
Test: Trigger FRP, enter wrong credential 10 times, verify no crash.
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