OSDN Git Service
Calin Juravle [Wed, 9 Aug 2017 01:47:46 +0000 (01:47 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
am:
0c62487d4b
Change-Id: Ie3d32c487a19a44e4a4bdf2d071b6ae297f25bae
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
Makoto Onuki [Wed, 9 Aug 2017 01:31:03 +0000 (01:31 +0000)]
Merge "Intern process names." into oc-mr1-dev
am:
a530d79209
Change-Id: I84c2c6cec01add83511fef717960f79eb7a763b9
Philip P. Moltmann [Wed, 9 Aug 2017 01:14:26 +0000 (01:14 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
am:
81021c77c8
Change-Id: I74a060fb30453c34533fbe7bd240803c80bf63f5
Philip P. Moltmann [Wed, 9 Aug 2017 01:13:33 +0000 (01:13 +0000)]
Prevent closing by prev owner after transfer.
am:
3306c0d76b
Change-Id: I8c033bbfda3177467878b6a456a790237730634d
Philip P. Moltmann [Wed, 9 Aug 2017 01:11:49 +0000 (01:11 +0000)]
Revert "Revert session-transfer change"
am:
7460c5917b
Change-Id: I9f7927993fb3166cc6aeca751dd97aebc277a5db
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"
Kevin Chyn [Wed, 9 Aug 2017 00:45:22 +0000 (00:45 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
am:
d952a8b81a
Change-Id: I30c3a2c7a633e3e0201d966c4cc6f5d406a5c1a8
TreeHugger Robot [Wed, 9 Aug 2017 00:22:01 +0000 (00:22 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
Todd Kennedy [Tue, 8 Aug 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
am:
6bf2990e28
Change-Id: Ia860bf5f5fc6b5851f076960e8228952f733e3ba
TreeHugger Robot [Tue, 8 Aug 2017 23:33:03 +0000 (23:33 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
Calin Juravle [Tue, 8 Aug 2017 22:35:01 +0000 (22:35 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev
am:
df421a8b47
Change-Id: I76e4499cf3ca4506f59f6c80c0f20faeda90f3e6
Fan Zhang [Tue, 8 Aug 2017 22:27:49 +0000 (22:27 +0000)]
Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev
am:
6a820f2238
Change-Id: Iea7029ed562585c1529419bfeff79590534ffe50
Yohei Yukawa [Tue, 8 Aug 2017 22:24:11 +0000 (22:24 +0000)]
Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev
am:
8c009ebf4a
Change-Id: I4e2385729f8cfe475531d36bdc6b3f13914f022a
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
Robert Berry [Tue, 8 Aug 2017 21:31:30 +0000 (21:31 +0000)]
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
am:
b152fb8d30
Change-Id: I62fd850aa7c91e6fec27736e62d200ee82d27d54
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:10:59 +0000 (21:10 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
am:
2ddac82335
Change-Id: I26963a3715fa0ea6222a5b68880456bdb1a6cdb0
Nate Fischer [Tue, 8 Aug 2017 21:00:59 +0000 (21:00 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
Makoto Onuki [Tue, 8 Aug 2017 20:55:56 +0000 (20:55 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
am:
8ede87ded8
Change-Id: I3bfdd696cfd7abb1cb9ff04d93b7ebe3953280c9
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
Pavel Grafov [Tue, 8 Aug 2017 20:21:24 +0000 (20:21 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
am:
072b71f73f
Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1
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
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:57:56 +0000 (19:57 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
am:
7bec053dff
Change-Id: I0e9f40dccf423899b48ba8af9f2c266d6f32dc1f
Philip P. Moltmann [Tue, 8 Aug 2017 19:49:13 +0000 (19:49 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
Sundeep Ghuman [Tue, 8 Aug 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
am:
a5a660a84d
Change-Id: Id3804ecaf51b18731d21dc8ff4f592bfcaa3095c
Wei Wang [Tue, 8 Aug 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
am:
23c0668a3f
Change-Id: Ib9ae218442f87cd3b09520e8c106b95ec2d2a947
TreeHugger Robot [Tue, 8 Aug 2017 19:35:36 +0000 (19:35 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
jackqdyulei [Tue, 8 Aug 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
am:
ed0c5cf48f
Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c
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
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
Takashi Furukawa [Tue, 8 Aug 2017 18:30:55 +0000 (18:30 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
am:
552d35cb4f
Change-Id: I04ea51eee6ad1030844a720132a3e67b007cb19f
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:55:10 +0000 (16:55 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
am:
3102245b62
Change-Id: I0997e70779456c1181d7750c1daa539afbc8dc0e
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
Android Build Merger (Role) [Tue, 8 Aug 2017 16:25:52 +0000 (16:25 +0000)]
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404 am:
eebd877904" into oc-mr1-dev-plus-aosp
Todd Kennedy [Tue, 8 Aug 2017 16:24:34 +0000 (16:24 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
eebd877904
Change-Id: If2743b679e9ba52e680f79349656629facb9cd0a
Todd Kennedy [Tue, 8 Aug 2017 16:22:15 +0000 (16:22 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
1f3c3376e6
Change-Id: Ie15dabd5cf3f53b447565a5a6472c32a7f645588
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
Hugo Benichi [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
am:
279c26fa24
Change-Id: Id85a409a2d3cc12e53f977f94f7b5a306115a09a
Todd Kennedy [Tue, 8 Aug 2017 16:16:05 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I7224af4db28368292609a6c7728bcfd9a299b784
Android Build Merger (Role) [Tue, 8 Aug 2017 16:12:29 +0000 (16:12 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33 am:
43581b8759" into oc-mr1-dev-plus-aosp
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
Hugo Benichi [Tue, 8 Aug 2017 16:10:52 +0000 (16:10 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33
am:
43581b8759
Change-Id: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
Todd Kennedy [Tue, 8 Aug 2017 16:06:17 +0000 (16:06 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
am:
8c18e1faf8
Change-Id: If0d1dc60455c961215454a5b2edcb59c0097add4
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
Hugo Benichi [Tue, 8 Aug 2017 16:01:07 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
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:36:05 +0000 (15:36 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
am:
faa01fb370
Change-Id: Iac1d92b1bd1571ef5f9ee93db7732ac947845d98
Todd Lee [Tue, 8 Aug 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 13:06:37 +0000 (13:06 +0000)]
Merge "Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 am:
ede09428f6 -s ours" into oc-mr1-dev-plus-aosp
Kenny Guy [Tue, 8 Aug 2017 13:04:09 +0000 (13:04 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5
am:
ede09428f6 -s ours
Change-Id: If05e756f102dc74cc3f46a03eed0fc53f954f15c
Kenny Guy [Tue, 8 Aug 2017 13:03:57 +0000 (13:03 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 -s ours
am:
c209e50d67 -s ours
Change-Id: I0f97b893f1c421b29cd95c60f91dcda4d4e95e7d
Kenny Guy [Tue, 8 Aug 2017 12:58:32 +0000 (12:58 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
am:
91866c65a5
Change-Id: Ia29014e839bfcf345e8efa56d8ec2906f80b1e38
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
Adrian Roos [Tue, 8 Aug 2017 12:02:27 +0000 (12:02 +0000)]
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
am:
956491b867
Change-Id: Ib8dd7a7a1805f9a2b00525ae9bd6ebcbc572f2fa
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
Android Build Merger (Role) [Tue, 8 Aug 2017 11:19:20 +0000 (11:19 +0000)]
Merge "Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7 am:
8201ed151c" into oc-mr1-dev-plus-aosp
Adrian Roos [Tue, 8 Aug 2017 11:16:54 +0000 (11:16 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7
am:
9e14ef5c67
Change-Id: I42494b9ee5ffae3bc9bdf0b2451eef36c42881a6
Adrian Roos [Tue, 8 Aug 2017 11:16:47 +0000 (11:16 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7
am:
8201ed151c
Change-Id: I08e16bbc83aad8953ab3d0a6067f64157bef3cb2
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:11:47 +0000 (11:11 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
am:
d58c6978a7
Change-Id: Id181cefb682aba4ff3066e9f08fe77db424f8b0d
TreeHugger Robot [Tue, 8 Aug 2017 11:05:53 +0000 (11:05 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 11:05:15 +0000 (11:05 +0000)]
Merge "Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf am:
aac5431f6b" into oc-mr1-dev-plus-aosp
Adrian Roos [Tue, 8 Aug 2017 11:03:17 +0000 (11:03 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf
am:
aac5431f6b
Change-Id: I810bf53ff9c6b222fc01886b042c4d0f1661011b
Adrian Roos [Tue, 8 Aug 2017 11:03:14 +0000 (11:03 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf
am:
3d8fd6e4b9
Change-Id: Idea0d06f3b548f99c6504044a193db42368381c8
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
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: I1eb1c997c551461ff09efd1f3ea35276cbb4d43d
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
Matthew Ng [Tue, 8 Aug 2017 10:29:54 +0000 (10:29 +0000)]
Merge "Recents scroll backwards (accessibility) if clear all button invisible" into oc-mr1-dev
am:
249acda3b6
Change-Id: I63621b117c7e16777662adeba71dd58bcefdf701
Matthew Ng [Tue, 8 Aug 2017 10:28:48 +0000 (10:28 +0000)]
Merge "Scrolling recents to next/prev page focuses next/prev node" into oc-mr1-dev
am:
c648e90bdd
Change-Id: I356bb7efc3a8fe3f58d708921e94d8ff22b10598
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:15:41 +0000 (09:15 +0000)]
Merge "system_server : trigger runtime restart when we're close to the soft FD limit." into oc-mr1-dev
am:
365ce730bd
Change-Id: Ib0bfbbd43de5ba7cc4cf550c4e5463529ddeff5b
Android Build Merger (Role) [Tue, 8 Aug 2017 09:11:31 +0000 (09:11 +0000)]
Merge "Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb am:
a40b8b7431" into oc-mr1-dev-plus-aosp
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:08:42 +0000 (09:08 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb
am:
aa73a69d3a
Change-Id: Idbfec034c44a355ddcf702bbfffea8107a48f702
fionaxu [Tue, 8 Aug 2017 09:08:42 +0000 (09:08 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb
am:
a40b8b7431
Change-Id: Iff48615957699f5ccf14bf092a7ed9766637524e
fionaxu [Tue, 8 Aug 2017 09:02:26 +0000 (09:02 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
am:
93bf6200eb
Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35
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
Hugo Benichi [Tue, 8 Aug 2017 09:01:19 +0000 (09:01 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours am:
607f74b317 -s ours am:
082a9fa173
am:
c9ef02ca17
Change-Id: I6c4f680e2fc5615c11be8659333ec78a440ef158
OSDN Git Service
