OSDN Git Service
Lorenzo Colitti [Wed, 28 Mar 2018 10:46:54 +0000 (10:46 +0000)]
[automerger skipped] Merge "Allow third party cookies in the captive portal login app." am:
be6d45fe92
am:
b3673e9698 -s ours
Change-Id: If0558566613d55147e227936882335a3088036d4
Lorenzo Colitti [Wed, 28 Mar 2018 10:34:30 +0000 (10:34 +0000)]
Merge "Allow third party cookies in the captive portal login app."
am:
be6d45fe92
Change-Id: I5cb87e87aa64aebebfd9969dfb1ddbf02418b174
Lorenzo Colitti [Wed, 28 Mar 2018 09:17:41 +0000 (09:17 +0000)]
Merge "Allow third party cookies in the captive portal login app."
Narayan Kamath [Wed, 28 Mar 2018 09:02:51 +0000 (09:02 +0000)]
Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev
am:
77e0b7b821
Change-Id: I8380a14b0862a8ec36b880c4e851120aa62d58e0
Jaewan Kim [Wed, 28 Mar 2018 08:53:06 +0000 (08:53 +0000)]
Merge "MediaSessionService: Stop using APIs in the MediaComponents" into pi-dev
am:
9911073f6a
Change-Id: I40f7e09d5b3d2f30c44f510b3d0b490cd7abf10f
Narayan Kamath [Wed, 28 Mar 2018 08:43:08 +0000 (08:43 +0000)]
Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev
Andy Chou [Wed, 28 Mar 2018 08:40:41 +0000 (08:40 +0000)]
Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
am:
a547a51818
Change-Id: Ib684023316d56af18066d1a9461630429fcb2afb
Jaewan Kim [Wed, 28 Mar 2018 08:40:23 +0000 (08:40 +0000)]
Merge "MediaSessionService: Stop using APIs in the MediaComponents" into pi-dev
Andy Chou [Wed, 28 Mar 2018 08:28:53 +0000 (08:28 +0000)]
Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
Lucas Dupin [Wed, 28 Mar 2018 06:36:03 +0000 (06:36 +0000)]
Merge "Fix scrim animation when unlocking with fp" into pi-dev
am:
4f4d78b877
Change-Id: I71f9c9966f161afe179a24628935097174d9ca21
Jaewan Kim [Wed, 28 Mar 2018 03:19:04 +0000 (12:19 +0900)]
MediaSessionService: Stop using APIs in the MediaComponents
Bug:
76441725
Test: Build and run CtsMediaTestCases
Change-Id: I06f0b9c146869e16f730a6c78cf10fac691026c9
TreeHugger Robot [Wed, 28 Mar 2018 06:23:20 +0000 (06:23 +0000)]
Merge "Fix scrim animation when unlocking with fp" into pi-dev
Andreas Gampe [Wed, 28 Mar 2018 05:56:06 +0000 (05:56 +0000)]
[automerger skipped] Merge "BgDexopt: Reschedule job on timeout" into pi-dev
am:
f0edf03eda -s ours
Change-Id: Iebb0cbab80791fa15a2e40049ec8b6f40441d5be
Andreas Gampe [Wed, 28 Mar 2018 05:47:01 +0000 (05:47 +0000)]
Merge "BgDexopt: Reschedule job on timeout" into pi-dev
Pavel Maltsev [Wed, 28 Mar 2018 05:28:17 +0000 (05:28 +0000)]
Merge "Merge "Minor clean-up in NetworkCapabilities" am:
539f85a18d am:
b1e2bfe4df am:
8a956a5141" into pi-dev
am:
601861fd1c
Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
Andreas Gampe [Wed, 28 Mar 2018 05:07:38 +0000 (05:07 +0000)]
Merge "BgDexopt: Reschedule job on timeout" am:
45bd60b4e2
am:
a4f14c5bff
Change-Id: Ie89209fdce23f878d6ebb315faa2a3bbaa67aef0
TreeHugger Robot [Wed, 28 Mar 2018 05:00:39 +0000 (05:00 +0000)]
Merge "Merge "Minor clean-up in NetworkCapabilities" am:
539f85a18d am:
b1e2bfe4df am:
8a956a5141" into pi-dev
Adam Newman [Wed, 28 Mar 2018 04:57:15 +0000 (04:57 +0000)]
Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev
am:
ace8e02633
Change-Id: I61e3a8f69d820348bc11d489ec4d927f54f3447f
Lucas Dupin [Wed, 28 Mar 2018 01:03:25 +0000 (18:03 -0700)]
Fix scrim animation when unlocking with fp
Notification panel expansion was overriding the animation.
The expansion needs to be ignored during "wake and unlock"
states.
Test: visual
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I781aece52c845f3fee9149c109ad598c7b555751
Fixes:
76018235
TreeHugger Robot [Wed, 28 Mar 2018 04:45:26 +0000 (04:45 +0000)]
Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev
Jiuyu Sun [Wed, 28 Mar 2018 04:37:53 +0000 (04:37 +0000)]
Merge "Address comments from API Review." into pi-dev
am:
a78a764fe3
Change-Id: I5aa5100fc837a813b8af60d26a05b29707aa5380
Svet Ganov [Wed, 28 Mar 2018 04:27:08 +0000 (04:27 +0000)]
Add API to query if a UID is active
am:
0c1c9cd7f2
Change-Id: Ic209da2a6817b82e7bcc09bd6eb2c0896a4071f5
Jiuyu Sun [Wed, 28 Mar 2018 04:18:51 +0000 (04:18 +0000)]
Merge "Address comments from API Review." into pi-dev
Svet Ganov [Sun, 25 Mar 2018 20:14:47 +0000 (13:14 -0700)]
Add API to query if a UID is active
Test: cts-tradefed run cts-dev -m CtsCameraTestCases
Bug:
72863398
Change-Id: I4bacfd87cac782ef178e9a279cd833b229150ae1
Andreas Gampe [Wed, 28 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
am:
45bd60b4e2
Change-Id: Ibe4e54f2f3ab0a7b1db3396cb1928a16b084f262
Svetoslav Ganov [Wed, 28 Mar 2018 03:36:04 +0000 (03:36 +0000)]
Merge "Throw on revoked location permission - framework" into pi-dev
am:
4acd39d3db
Change-Id: Ia4dd0dc5bc0296da541d68714f54c68a75cb32cc
Svetoslav Ganov [Wed, 28 Mar 2018 03:22:22 +0000 (03:22 +0000)]
Merge "Throw on revoked location permission - framework" into pi-dev
Philip P. Moltmann [Wed, 28 Mar 2018 03:12:44 +0000 (03:12 +0000)]
Merge "Use package manager stock flags to pull lib info" into pi-dev
am:
2bfb9a15ad
Change-Id: I420e5273c5869f660cbcf9ac02120dc76f203985
Andreas Gampe [Tue, 27 Mar 2018 22:04:19 +0000 (15:04 -0700)]
BgDexopt: Reschedule job on timeout
When the background dexopt job times out, tell the scheduler to
reschedule it, as we have more work to do.
(cherry picked from commit
c157be081ebe3b8aba360330fcdaa8b7eeb67024)
Bug:
76425903
Test: m
Test: manual
Merged-In: Ibbdb979bceb1ff0a25f8aed2b3cc26a7f30057e2
Change-Id: Ibbdb979bceb1ff0a25f8aed2b3cc26a7f30057e2
Doris Liu [Wed, 28 Mar 2018 03:02:45 +0000 (03:02 +0000)]
Merge "More path validation for better error message" into pi-dev
am:
4f975de2f8
Change-Id: I5067e34175b4920ee7a5112e3c72971ef74710c4
TreeHugger Robot [Wed, 28 Mar 2018 03:00:23 +0000 (03:00 +0000)]
Merge "Use package manager stock flags to pull lib info" into pi-dev
Andreas Gampe [Wed, 28 Mar 2018 02:53:57 +0000 (02:53 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
TreeHugger Robot [Wed, 28 Mar 2018 02:53:19 +0000 (02:53 +0000)]
Merge "More path validation for better error message" into pi-dev
Jaekyun Seok [Wed, 28 Mar 2018 02:52:36 +0000 (02:52 +0000)]
Merge "Call mInstaller.idmap() without holding mPackages" into pi-dev
am:
4836f8b003
Change-Id: I62623b100213869bef67fd5a1c1d6afba34bbb8d
TreeHugger Robot [Wed, 28 Mar 2018 02:40:46 +0000 (02:40 +0000)]
Merge "Call mInstaller.idmap() without holding mPackages" into pi-dev
Kevin Chyn [Wed, 28 Mar 2018 02:31:05 +0000 (02:31 +0000)]
Merge "Add talkback when FingerprintDialog is authenticated" into pi-dev
am:
9f24799af3
Change-Id: I4e14ec7716635cea8d5825cfcda2349b47f89725
Kevin Chyn [Wed, 28 Mar 2018 02:22:04 +0000 (02:22 +0000)]
Merge "Add talkback when FingerprintDialog is authenticated" into pi-dev
Suprabh Shukla [Wed, 28 Mar 2018 02:21:24 +0000 (02:21 +0000)]
Merge "Optimizing TimeSparseArray#put in case of collisions" into pi-dev
am:
7eee509df5
Change-Id: I94fcc01c6a767fb21f962dd36fc2c464650cb5cb
Phil Weaver [Wed, 28 Mar 2018 02:16:26 +0000 (02:16 +0000)]
Merge "Use on-screen text in a11y text changed event" into pi-dev
am:
ebd87bf395
Change-Id: I9822bdafb8198abe67c02cc4b1b2edb2e6c02613
TreeHugger Robot [Wed, 28 Mar 2018 02:10:45 +0000 (02:10 +0000)]
Merge "Optimizing TimeSparseArray#put in case of collisions" into pi-dev
Lucas Dupin [Wed, 28 Mar 2018 02:09:56 +0000 (02:09 +0000)]
Merge "Unload wallpaper bitmap and release HwuiContext" into pi-dev
am:
3844e1d83c
Change-Id: I845b4ec476ea1c7e9bfa44a224818dea85c06577
TreeHugger Robot [Wed, 28 Mar 2018 02:06:27 +0000 (02:06 +0000)]
Merge "Use on-screen text in a11y text changed event" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 01:59:26 +0000 (01:59 +0000)]
Merge "Unload wallpaper bitmap and release HwuiContext" into pi-dev
Hansong Zhang [Wed, 28 Mar 2018 01:31:44 +0000 (01:31 +0000)]
[automerger skipped] Merge changes I70eafe03,Ia44e16c5 am:
b52f49153c
am:
464d62791f -s ours
Change-Id: Idb118edaa9b4fe7cb7db1ab6b16a96c7dfa0eba8
Android Build Merger (Role) [Wed, 28 Mar 2018 01:28:01 +0000 (01:28 +0000)]
Merge "Merge "Hide activities when AOD comes in" into pi-dev am:
11866a4242" into pi-dev-plus-aosp
Lucas Dupin [Wed, 28 Mar 2018 01:26:42 +0000 (01:26 +0000)]
Merge "Hide activities when AOD comes in" into pi-dev
am:
11866a4242
Change-Id: I7b4524fb00fbd394c7e0794f052f394c1aad5460
Benedict Wong [Wed, 28 Mar 2018 01:26:33 +0000 (01:26 +0000)]
Merge "Add documentation for TCP interactions with transforms" am:
b454937f06
am:
28427a9c4d
Change-Id: I3aef3f0f16929b60cd9bb293373d18a3988076a7
Hansong Zhang [Wed, 28 Mar 2018 01:20:03 +0000 (01:20 +0000)]
Merge changes I70eafe03,Ia44e16c5
am:
b52f49153c
Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9
Benedict Wong [Wed, 28 Mar 2018 01:15:22 +0000 (01:15 +0000)]
Merge "Add documentation for TCP interactions with transforms"
am:
b454937f06
Change-Id: I2733218b5b3489902f80b694a1dd6b0d4c1198da
TreeHugger Robot [Wed, 28 Mar 2018 01:14:35 +0000 (01:14 +0000)]
Merge "Remove non-tombstoned ANR path." into pi-dev-plus-aosp
TreeHugger Robot [Wed, 28 Mar 2018 01:11:42 +0000 (01:11 +0000)]
Merge "Hide activities when AOD comes in" into pi-dev
Suprabh Shukla [Wed, 28 Mar 2018 00:58:47 +0000 (00:58 +0000)]
Merge "Sending MY_PACKAGE_SUSPENDED to suspended apps" into pi-dev
am:
1c73370df4
Change-Id: I7d2ab9a1d57c9837a9ed5564fbc609bf11d59b8f
Joshua Baxter [Wed, 28 Mar 2018 00:51:38 +0000 (00:51 +0000)]
docs: fixed typo am:
eb5d2d96ad
am:
2ae75ba1ab
Change-Id: I85c41033aeffed7a06e4a85a00725183c314ab8a
TreeHugger Robot [Wed, 28 Mar 2018 00:45:23 +0000 (00:45 +0000)]
Merge "Sending MY_PACKAGE_SUSPENDED to suspended apps" into pi-dev
Svet Ganov [Thu, 8 Mar 2018 03:53:43 +0000 (19:53 -0800)]
Throw on revoked location permission - framework
When we fixed proper handling of location permisison gating
sensitive telephony calls we stopped throwing a security
exception when the permission is not held by the caller.
While this is not a security issue there is no reason to
change this behavior which is checked by CTS. This CL starts
throwing a security exception if the permission is not held.
Test: atest android.permission.cts.NoLocationPermissionTest
bug:
74074103
Change-Id: Ic891d62b408c692f84a345f24503f7f25d583e35
Clément Julliard [Wed, 28 Mar 2018 00:42:25 +0000 (00:42 +0000)]
Merge "Relax constraints on valid ImageReader usage flags" into pi-dev
am:
fa43016626
Change-Id: I6e72c51e84a3d44fe2b7a5c53ee5b8627a823336
Joshua Baxter [Wed, 28 Mar 2018 00:33:50 +0000 (00:33 +0000)]
docs: fixed typo
am:
eb5d2d96ad
Change-Id: I60e1befd90c14fe0ef6b3b8813bb2a791f8a7399
Yao Chen [Wed, 28 Mar 2018 00:32:45 +0000 (00:32 +0000)]
Merge "Update Guardrail." into pi-dev
am:
55b486eb6e
Change-Id: I8d46fd41aa0456d5b51d6157e3f7e0c1a04fab95
Clément Julliard [Wed, 28 Mar 2018 00:23:29 +0000 (00:23 +0000)]
Merge "Relax constraints on valid ImageReader usage flags" into pi-dev
Kweku Adams [Wed, 28 Mar 2018 00:17:59 +0000 (00:17 +0000)]
Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev
am:
788e74a613
Change-Id: Ib03f55dd91feb08b9f6f91238d8ea8cbaabcbd2d
Phil Weaver [Wed, 21 Mar 2018 19:33:59 +0000 (12:33 -0700)]
Use on-screen text in a11y text changed event
The beforeText in a text changed event was coming from
the underlying CharSequence, not what was on the screen.
As a result, it was not sent for password fields. Now
we just provide whatever is on the screen, which is
obfuscated to the same degree it is for a user looking
at the screen.
Bug:
75324441
Test: Verified with password field in TalkBack sample app.
Also atest CtsAccessibilityServiceTestCases
Change-Id: Ib7a10313d2f9d0e44d2052e81e47f19967a67bc4
Beverly [Wed, 28 Mar 2018 00:00:11 +0000 (00:00 +0000)]
Merge "clear calling identity on isPackageSuspended" into pi-dev
am:
15db763bca
Change-Id: I928899df39d9fc3853cfb6ff683f5ee75cd7b3d2
Kweku Adams [Tue, 27 Mar 2018 23:54:41 +0000 (23:54 +0000)]
Merge "Refactoring SystemSettingsProto to avoid method limit." into pi-dev
am:
f2977ce61e
Change-Id: I56fb1bcfe409b9b44f91f2303af73f164e5ff528
Ruchi Kandoi [Tue, 27 Mar 2018 23:50:28 +0000 (23:50 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines" into pi-dev
am:
df369da85f
Change-Id: I1d94d93bcd80100d272632520a55affb996e93cf
Xiangyu/Malcolm Chen [Tue, 27 Mar 2018 23:44:31 +0000 (23:44 +0000)]
Merge "Clean new TelephonyManager API." into pi-dev
am:
2fc8197b4d
Change-Id: If9aee21db6ff22e00a52b8d5191cec7f157fc4e7
TreeHugger Robot [Tue, 27 Mar 2018 23:44:23 +0000 (23:44 +0000)]
Merge "Update Guardrail." into pi-dev
Dianne Hackborn [Tue, 27 Mar 2018 23:37:02 +0000 (23:37 +0000)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
am:
00f3c4333e
Change-Id: I3bff628d13f1089213edf84aa1feffd683b99cd7
Brian Young [Tue, 27 Mar 2018 23:31:01 +0000 (23:31 +0000)]
Merge "Refactor AddUserAuthArgs for extensibility" into pi-dev
am:
56e9c026b3
Change-Id: Icd9563c6b56691f1f59bd958eb578e8eb5cfb192
Suprabh Shukla [Tue, 27 Mar 2018 22:39:52 +0000 (15:39 -0700)]
Optimizing TimeSparseArray#put in case of collisions
Adding a linear check instead of binary searching everytime. Logging
only when the displacement is greater than 10 millis.
Test: python system/extras/boottime_tools/bootanalyze/bootanalyze.py\
-r -c system/extras/boottime_tools/bootanalyze/config.yaml -n 10
and
atest android.app.usage.TimeSparseArrayTest
Bug:
76435713
Change-Id: I8f4df59e84fc196d0f63f9433d01ebc759f104c4
Lucas Dupin [Tue, 27 Mar 2018 16:50:19 +0000 (09:50 -0700)]
Unload wallpaper bitmap and release HwuiContext
To decrease sysui memory usage
Test: adb dumpsys meminfo
Fixes:
74534423
Change-Id: I3cb4a5927e8d6b20a7aeba3fda253f0ba4cc18f6
Narayan Kamath [Tue, 27 Mar 2018 23:24:24 +0000 (23:24 +0000)]
Merge "Revert "Close print writers"" into pi-dev
am:
cdaba41a6f
Change-Id: Ibb21e91d2e709c916cc9965719501ae903757308
TreeHugger Robot [Tue, 27 Mar 2018 23:17:31 +0000 (23:17 +0000)]
Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev
Eric Schwarzenbach [Tue, 27 Mar 2018 23:12:34 +0000 (23:12 +0000)]
Merge "Add constants for reporting criteria" am:
a36ada4b95
am:
92e5b09df7
Change-Id: I86d0435f401f8c4a93087e83bbbd78f0347bb151
Eric Schwarzenbach [Tue, 27 Mar 2018 23:02:53 +0000 (23:02 +0000)]
Merge "Add constants for reporting criteria"
am:
a36ada4b95
Change-Id: Ib928d0de3e7e33a5efec3b5d5fe6e99f2782058d
Christopher Tate [Tue, 27 Mar 2018 23:02:45 +0000 (23:02 +0000)]
Merge "Regularize some wallpaper APIs" into pi-dev
am:
17b6490ce1
Change-Id: I3ce564689cea8a2172dc682813c7bd0dcec3b199
Andrew Chant [Tue, 27 Mar 2018 22:57:59 +0000 (22:57 +0000)]
Merge "ALSA jack detection support - match upstream kernel" into pi-dev
am:
0fba0640a1
Change-Id: I4ff8f7ceec7d03788bf564c5f192d8c412e140be
TreeHugger Robot [Tue, 27 Mar 2018 22:57:23 +0000 (22:57 +0000)]
Merge "clear calling identity on isPackageSuspended" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 22:54:51 +0000 (22:54 +0000)]
Merge "Refactoring SystemSettingsProto to avoid method limit." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 22:54:25 +0000 (22:54 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines" into pi-dev
goneil [Tue, 27 Mar 2018 22:48:15 +0000 (22:48 +0000)]
Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" into pi-dev
am:
781e50a49b
Change-Id: I339112b7264524e9bd375c9e3f20914964a2f8c5
Pavel Maltsev [Wed, 7 Mar 2018 23:40:32 +0000 (23:40 +0000)]
Merge "Minor clean-up in NetworkCapabilities" am:
539f85a18d am:
b1e2bfe4df
am:
8a956a5141
Bug:
72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit
feb8d1498a822730e29cf346fe3382e3f5293a58)
Treehugger Robot [Tue, 27 Mar 2018 22:45:18 +0000 (22:45 +0000)]
Merge changes I70eafe03,Ia44e16c5
* changes:
Hearing Aid Profile: set and get activeDevice
Move the setActiveDevice logic from Settings to SettingsLib (1/2)
Xiangyu/Malcolm Chen [Tue, 27 Mar 2018 22:42:58 +0000 (22:42 +0000)]
Merge "Clean new TelephonyManager API." into pi-dev
Sunny Goyal [Tue, 27 Mar 2018 22:41:49 +0000 (22:41 +0000)]
Merge "Using an intent-action instead of a fixed compoenent for quick-step service" into pi-dev
am:
4d40f040d3
Change-Id: Ib7d7dc54ba18a25b28482c9fdf4a18fecc8c2f81
Dianne Hackborn [Tue, 27 Mar 2018 22:40:51 +0000 (22:40 +0000)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
Bookatz [Tue, 27 Mar 2018 22:38:34 +0000 (22:38 +0000)]
Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev
am:
dda147e179
Change-Id: I56f8d7871149412747b708667c089045ff14451e
jiabin [Tue, 27 Mar 2018 22:30:30 +0000 (22:30 +0000)]
Merge "Add lock when adjusting suggested stream volume." into pi-dev
am:
aa614fafc7
Change-Id: I4d1a3568aaca76db25e69a2896958794d74981e8
Android Build Merger (Role) [Tue, 27 Mar 2018 22:20:57 +0000 (22:20 +0000)]
Merge "Merge "Configurable hidden API exemptions." am:
4b8285b907 am:
625aa8d33a" into pi-dev-plus-aosp
Mathew Inwood [Tue, 27 Mar 2018 22:19:51 +0000 (22:19 +0000)]
Merge "Configurable hidden API exemptions." am:
4b8285b907
am:
625aa8d33a
Change-Id: I3ead821be36e65c5d6abf7b40ecb3171949656f9
Benedict Wong [Tue, 27 Mar 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Add documentation for TCP interactions with transforms"
Makoto Onuki [Tue, 27 Mar 2018 22:19:01 +0000 (22:19 +0000)]
Merge "Add auto battery saver suggestion notification/dialog" into pi-dev
am:
452ae34af5
Change-Id: Ifaa72ab628c4fd319f0b1d23fe6d6ec7f9149477
TreeHugger Robot [Tue, 27 Mar 2018 22:13:37 +0000 (22:13 +0000)]
Merge "Refactor AddUserAuthArgs for extensibility" into pi-dev
Winson Chung [Tue, 27 Mar 2018 22:12:53 +0000 (22:12 +0000)]
Merge "Use package context for loading task description icon resource" into pi-dev
am:
a17eccac73
Change-Id: I0649ed9f3c5c635359d73eda0ca5abeaf7b75ce3
Meng Wang [Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)]
Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
am:
2cc67382c0
Change-Id: Ic92575356dbad97423a99285b4a0715c1e8e4886
Mathew Inwood [Tue, 27 Mar 2018 22:05:14 +0000 (22:05 +0000)]
Merge "Configurable hidden API exemptions."
am:
4b8285b907
Change-Id: Ia61896bdedff170d75715094ce87b97dc96994ed
Andreas Gampe [Tue, 27 Mar 2018 22:04:19 +0000 (15:04 -0700)]
BgDexopt: Reschedule job on timeout
When the background dexopt job times out, tell the scheduler to
reschedule it, as we have more work to do.
Bug:
76425903
Test: m
Test: manual
Change-Id: Ibbdb979bceb1ff0a25f8aed2b3cc26a7f30057e2
TreeHugger Robot [Tue, 27 Mar 2018 22:00:07 +0000 (22:00 +0000)]
Merge "Revert "Close print writers"" into pi-dev
Chavi Weingarten [Tue, 27 Mar 2018 21:56:01 +0000 (21:56 +0000)]
Merge "Don't animate dim layer exit when recents animation finishes." into pi-dev
am:
ce61d118de
Change-Id: Ida93d21b52438fc9b880a43feb75446dfa7782df
Lorenzo Colitti [Sun, 25 Mar 2018 16:32:33 +0000 (01:32 +0900)]
Allow third party cookies in the captive portal login app.
Fix:
73909651
Test: Captive portal login app still works
Change-Id: I3ffda92e7d764ea9957df1a5408839cf10a26be5
Merged-In: I0174124cad9c108a26594b0ddd6162ca3ea6e68d
(cherry picked from commit
c3c95bab8ec7f3ef4e7649b5d24ea6525a407c44)
TreeHugger Robot [Tue, 27 Mar 2018 21:50:31 +0000 (21:50 +0000)]
Merge "Regularize some wallpaper APIs" into pi-dev
OSDN Git Service
