OSDN Git Service
Mathieu Chartier [Fri, 16 Jun 2017 02:09:38 +0000 (19:09 -0700)]
Add property for system server compiler filter
The property is dalvik.vm.systemservercompilerfilter, this changes
if dexopt is needed.
Bug:
62356545
Test: adb shell setprop dalvik.vm.systemservercompilerfilter quicken
Test: adb shell stop && adb shell start
Change-Id: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Roozbeh Pournader [Thu, 15 Jun 2017 17:21:48 +0000 (17:21 +0000)]
Merge "Make Linkify use the SIM card's country for phone numbers"
Marc Hittinger [Thu, 15 Jun 2017 17:15:34 +0000 (17:15 +0000)]
Merge "Remove redundant hwaccelerated enabling."
Chris Wren [Thu, 15 Jun 2017 16:46:53 +0000 (16:46 +0000)]
Merge "Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
4bf303695b" into oc-dr1-dev-plus-aosp
am:
9de4174689
Change-Id: I8e9ab9456a0b1f6381dee4ce7fe40a313f23860d
Chris Wren [Thu, 15 Jun 2017 16:43:57 +0000 (16:43 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
c31da7a282
am:
0e21a57709
Change-Id: I4f3bba6ede13af9140de86724e663eb0372a3ed8
Android Build Merger (Role) [Thu, 15 Jun 2017 16:40:10 +0000 (16:40 +0000)]
Merge "Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
4bf303695b" into oc-dr1-dev-plus-aosp
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
c31da7a282
Change-Id: I0dba70d94710852d07fa3f141d61ed869756a379
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
4bf303695b
Change-Id: I8549aa837ade3636532deeacb197037e6da131a8
Evan Laird [Thu, 15 Jun 2017 16:31:56 +0000 (16:31 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev am:
e836b7d8e5
am:
2cac3959c0
Change-Id: Id9a199bf0ccd6c9ac831dfebfd0f9d67649aa01d
Chris Wren [Thu, 15 Jun 2017 16:28:32 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: I4813fcd717b966e2ed2b1835d12d4183633f60ff
Chris Wren [Thu, 15 Jun 2017 16:28:27 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: Ic53f15be9f13034e72fa056308e75fa0f4f310b0
Evan Laird [Thu, 15 Jun 2017 16:22:01 +0000 (16:22 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
am:
e836b7d8e5
Change-Id: I39dd789b5daea9abfafac22860e68d43d2a07746
TreeHugger Robot [Thu, 15 Jun 2017 16:20:07 +0000 (16:20 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 16:14:46 +0000 (16:14 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
Chris Wren [Wed, 14 Jun 2017 19:59:03 +0000 (15:59 -0400)]
add a log for peek to shade expansion
Move the note_load counter into the manager, replacing
the redundant and useless notification_load counter.
Update the StatusBarTest to allow for hander side-effects.
Test: runtest systemui
Change-Id: I2551c51cc0f4627995abe4401eafc2e5adb3a8fa
Fixes:
27698560
Derek Sollenberger [Thu, 15 Jun 2017 12:54:17 +0000 (12:54 +0000)]
Merge "Revert buffer age workaround for Adreno GPUs."
Paul Duffin [Thu, 15 Jun 2017 11:13:08 +0000 (11:13 +0000)]
Fix dependencies of packages that target earlier releases am:
37e9a28262
am:
68117e559a
Change-Id: I9c0617b6d29afd7a00ae6ead042225489b934255
Paul Duffin [Thu, 15 Jun 2017 11:04:30 +0000 (11:04 +0000)]
Fix dependencies of packages that target earlier releases
am:
37e9a28262
Change-Id: Ib8b9272423ba7513ea653843335fd1907970c40f
Erik Kline [Thu, 15 Jun 2017 10:58:12 +0000 (10:58 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev am:
ed1519d095 -s ours
am:
8411065453 -s ours
Change-Id: I3e695c75e3e06f0bd70568b462f0ba9cf307384c
Erik Kline [Thu, 15 Jun 2017 10:49:12 +0000 (10:49 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
am:
ed1519d095 -s ours
Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e
TreeHugger Robot [Thu, 15 Jun 2017 10:43:18 +0000 (10:43 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
Paul Duffin [Tue, 13 Jun 2017 14:53:11 +0000 (15:53 +0100)]
Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.
This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* packages/SettingsProvider/test/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SettingsProviderTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
SettingsProviderTest uses classes from package android.test
(possible indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
* services/tests/servicestests/Android.mk
Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
FrameworksServicesTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
FrameworksServicesTests's manifest file (AndroidManifest.xml)
targets API level 26 and uses the android.test.runner library which
will provide the classes dynamically at runtime.
Dependency 'android.test.mock.sdk' is used instead of
'android.test.mock' because module FrameworksServicesTests builds
against internal jars not the API and so should use libraries that
build against internal jars not the API.
* tests/AppLaunch/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from
package android.test (possible indirectly) and needs them available
at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppLaunch's manifest file (AndroidManifest.xml) targets API
level 24 and dynamically includes the android.test.runner library
at runtime so there is no point in statically including the
classes.
* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes
from package android.test (possible indirectly) and needs them
available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SmartCamera-tests's manifest file (AndroidManifest.xml)
targets API level 17 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
* tests/Compatibility/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses
classes from package android.test (possible indirectly) and needs
them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppCompatibilityTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Bug:
30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0
Jorim Jaggi [Thu, 15 Jun 2017 06:48:31 +0000 (06:48 +0000)]
Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
641160b7d4" into oc-dr1-dev-plus-aosp
am:
2e26c880b2
Change-Id: I6bc39ca7e61285da880eb5b3916b4828f6745d41
Jorim Jaggi [Thu, 15 Jun 2017 06:45:49 +0000 (06:45 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
a3fe8ac375
am:
385e6c69fb
Change-Id: Ia1b3d52bdcf7a8d9c436ccb643f33dd33a6bab9a
Android Build Merger (Role) [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
641160b7d4" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Thu, 15 Jun 2017 06:37:48 +0000 (06:37 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c
am:
a3fe8ac375
Change-Id: I5c1ee370d7e1601504c9760b64fda068fbedb02a
Jorim Jaggi [Thu, 15 Jun 2017 06:37:47 +0000 (06:37 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c
am:
641160b7d4
Change-Id: I035880f9702a2f3978e951cda519c40d4fabd19a
Jorim Jaggi [Thu, 15 Jun 2017 06:37:39 +0000 (06:37 +0000)]
Merge "Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
e5e4365ba6" into oc-dr1-dev-plus-aosp
am:
1676f81a7a
Change-Id: Ia7cf1b862975da505e3a9898ba8b216d5f91c052
Jorim Jaggi [Thu, 15 Jun 2017 06:35:13 +0000 (06:35 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
06f3e97e3f
am:
b8fe4339cc
Change-Id: I368f1c4158e1a7b209fea067a27930f0723d1c95
Jorim Jaggi [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Iee0f34f4a285b02d3747f630058ef6fad50d4c79
Jorim Jaggi [Thu, 15 Jun 2017 06:30:15 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Idb18d226c2d7d427fcbb61ff2218d5fd034cb63e
Android Build Merger (Role) [Thu, 15 Jun 2017 06:29:46 +0000 (06:29 +0000)]
Merge "Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436 am:
e5e4365ba6" into oc-dr1-dev-plus-aosp
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
29337859
Bug:
32163131
Merged-In: I9937297727aa1a063e499fccd5833ace229b1e8a
Merged-In: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b
Merged-In: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
(cherry picked from commit
a1d368af2f01e2048240fb730f6cc399fc1cc1ab)
Jorim Jaggi [Thu, 15 Jun 2017 06:27:19 +0000 (06:27 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436
am:
e5e4365ba6
Change-Id: I91ed3bbc04340a8effda1381a95f239231101b5f
Jorim Jaggi [Thu, 15 Jun 2017 06:27:18 +0000 (06:27 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev am:
7831f0c436
am:
06f3e97e3f
Change-Id: I3195d7c680c06513d7c2d6c4a7b6290123841126
Juho Ha [Thu, 15 Jun 2017 06:25:14 +0000 (06:25 +0000)]
Merge "Disabled task snapshot for IoT devices"
TreeHugger Robot [Thu, 15 Jun 2017 06:24:30 +0000 (06:24 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
Jorim Jaggi [Thu, 15 Jun 2017 06:18:48 +0000 (06:18 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
am:
7831f0c436
Change-Id: I04be9b9286240009dd4e8c6cfd207b04eadf9b5d
Jorim Jaggi [Thu, 15 Jun 2017 06:18:48 +0000 (06:18 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
am:
7831f0c436
Change-Id: Ie09778df49eaa937b96a38f9c07d27bf87dbfdcf
Jorim Jaggi [Thu, 15 Jun 2017 06:11:10 +0000 (06:11 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 05:41:51 +0000 (05:41 +0000)]
Merge "Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
7dd2635319" into oc-dr1-dev-plus-aosp
am:
3e8e8c3395
Change-Id: Idf481723aff1a8b7b6f01e5059c88f2cb0b0c5ce
Sundeep Ghuman [Thu, 15 Jun 2017 05:39:49 +0000 (05:39 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
73df65acd7
am:
85a6bfdc02
Change-Id: Ic5591e4563c7c8421d9b99e683a45935e3e2691e
Android Build Merger (Role) [Thu, 15 Jun 2017 05:33:38 +0000 (05:33 +0000)]
Merge "Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1 am:
7dd2635319" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 15 Jun 2017 05:31:17 +0000 (05:31 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1
am:
73df65acd7
Change-Id: I54d8b86ee9d65bf1ed8337791de9d116017214c9
Sundeep Ghuman [Thu, 15 Jun 2017 05:31:16 +0000 (05:31 +0000)]
Merge "Create a staleScanResults bit." into oc-dev am:
d1094717a1
am:
7dd2635319
Change-Id: I03e5fe3084e891e1aa2b9d6446b77eddaf7b1ccb
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:30:58 +0000 (05:30 +0000)]
Merge "Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am:
cbf19dcd76 am:
4372af3090" into oc-dr1-dev-plus-aosp
am:
a4c4ef8bd0
Change-Id: I9ec8195c23347864abf2bbd1a129cace39abbf28
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:28:38 +0000 (05:28 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am:
cbf19dcd76 am:
746305ffda
am:
1b88db036b
Change-Id: I8715e7c65d7e547046e6fd06b64b5a2736b0776e
Sundeep Ghuman [Thu, 15 Jun 2017 05:23:48 +0000 (05:23 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
am:
d1094717a1
Change-Id: Iab2e12d6c307dd57f14ff4830a5827d3c687fa04
Sundeep Ghuman [Thu, 15 Jun 2017 05:23:46 +0000 (05:23 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
am:
d1094717a1
Change-Id: I1a4ea5a52093fa2cd9fe1bc321786c349d4c4f11
Android Build Merger (Role) [Thu, 15 Jun 2017 05:23:07 +0000 (05:23 +0000)]
Merge "Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am:
cbf19dcd76 am:
4372af3090" into oc-dr1-dev-plus-aosp
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:20:45 +0000 (05:20 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am:
cbf19dcd76
am:
4372af3090
Change-Id: I326a7d9da43e02d0b5c26e0d8476898957524724
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:20:41 +0000 (05:20 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am:
cbf19dcd76
am:
746305ffda
Change-Id: If7290eecead220e579d22f7c1115bb619cc6386c
TreeHugger Robot [Thu, 15 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:12:45 +0000 (05:12 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
am:
cbf19dcd76
Change-Id: If78cc6a4c6a0677e872a99aab9a607022b9008ad
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:12:40 +0000 (05:12 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
am:
cbf19dcd76
Change-Id: I65c49c99106c47c0b0cfe70f3673b079bc00b323
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:05:21 +0000 (05:05 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
Erik Kline [Thu, 15 Jun 2017 04:56:12 +0000 (04:56 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" into oc-dr1-dev am:
e2b1b38c18 -s ours
am:
c09807b07d -s ours
Change-Id: Ibffd953d370b07f3bd76f6ba74e4a5bb118107fa
Erik Kline [Thu, 15 Jun 2017 04:47:45 +0000 (04:47 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" into oc-dr1-dev
am:
e2b1b38c18 -s ours
Change-Id: Icf90f20b3425b1a504297fa55c29dab15149bc8f
Jorim Jaggi [Thu, 15 Jun 2017 04:44:04 +0000 (04:44 +0000)]
Merge "Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am:
04c3cc6d12 am:
71e1b227cd" into oc-dr1-dev-plus-aosp
am:
a471467537
Change-Id: I0eedca3950ce2d0ca7db49fc611859f5e1721c6e
Jorim Jaggi [Thu, 15 Jun 2017 04:41:40 +0000 (04:41 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am:
04c3cc6d12 am:
3ef3763930
am:
93a50f941f
Change-Id: If6f9ac46546893c45f4bbacd64985650b7807855
TreeHugger Robot [Thu, 15 Jun 2017 04:36:37 +0000 (04:36 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" into oc-dr1-dev
Android Build Merger (Role) [Thu, 15 Jun 2017 04:35:47 +0000 (04:35 +0000)]
Merge "Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am:
04c3cc6d12 am:
71e1b227cd" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Thu, 15 Jun 2017 04:33:08 +0000 (04:33 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am:
04c3cc6d12
am:
3ef3763930
Change-Id: I114f8afe8cbaa5fe8f060aa0bd2406077fada1f9
Jorim Jaggi [Thu, 15 Jun 2017 04:33:08 +0000 (04:33 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev am:
04c3cc6d12
am:
71e1b227cd
Change-Id: I5452eaba35ecf5df17c318258847a97be309ccc7
Jorim Jaggi [Wed, 14 Jun 2017 23:04:59 +0000 (16:04 -0700)]
Remove snapshot when screen gets rotated in mean time
We also need to wait for windows that are not gone for layout, as
otherwise we'd unfreeze before the surface is actually created.
Test: go/wm-smoke
Test: Open Camera in landscape but home screen locked to portrait
Change-Id: I0fc7a016445e18af1eead292665702b768b4e95b
Fixes:
38261533
Jorim Jaggi [Thu, 15 Jun 2017 04:25:08 +0000 (04:25 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
am:
04c3cc6d12
Change-Id: I048aeb67b8e17bbece7a07827ffb3745c6adbe63
Jorim Jaggi [Thu, 15 Jun 2017 04:25:04 +0000 (04:25 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
am:
04c3cc6d12
Change-Id: I9d9afbb3161bd5abfa9d4fe2a98e00b643b602ea
Jorim Jaggi [Thu, 15 Jun 2017 04:19:48 +0000 (04:19 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
Jeff Davidson [Thu, 15 Jun 2017 03:49:31 +0000 (03:49 +0000)]
Merge "eUICC API error code cleanup." into oc-dr1-dev am:
93a59696ad
am:
7074cb84f0
Change-Id: I71f401ce03c51a6c5b52ececda183f8a32433c9c
Jeff Davidson [Thu, 15 Jun 2017 03:42:02 +0000 (03:42 +0000)]
Merge "eUICC API error code cleanup." into oc-dr1-dev
am:
93a59696ad
Change-Id: Ie12b3809b3819028965d50653db8147dadf3bcdb
Jeff Davidson [Thu, 15 Jun 2017 03:35:07 +0000 (03:35 +0000)]
Merge "eUICC API error code cleanup." into oc-dr1-dev
qingxi [Thu, 15 Jun 2017 03:34:14 +0000 (03:34 +0000)]
Merge "Fix NPE for KeyguardEsimArea#isEsimLocked" into oc-dr1-dev am:
a3891ae678
am:
96ee3db962
Change-Id: I27a852b72c360d2624d9b35d009e0e31f8405b37
qingxi [Thu, 15 Jun 2017 03:25:07 +0000 (03:25 +0000)]
Merge "Fix NPE for KeyguardEsimArea#isEsimLocked" into oc-dr1-dev
am:
a3891ae678
Change-Id: Idb8f72137844d370fa9e95195dd6b57cbaf3391e
TreeHugger Robot [Thu, 15 Jun 2017 03:20:52 +0000 (03:20 +0000)]
Merge "Fix NPE for KeyguardEsimArea#isEsimLocked" into oc-dr1-dev
Juho Ha [Thu, 15 Jun 2017 02:38:56 +0000 (11:38 +0900)]
Disabled task snapshot for IoT devices
Disable this function for IoT devices, since many of them
don't have the display and are running low on RAM.
Also, some IoT devices crash when taking snapshot.
Bug:
62182164
Test: System service does not crash when user app dies on IoT device
Change-Id: I4e1e8ef27e4e7e3525f0051349dc8bacd6436ba1
Lei Yu [Thu, 15 Jun 2017 02:30:49 +0000 (02:30 +0000)]
Merge "Merge "Revert the time zone display name logic" into oc-dev am:
d9b1697b2d am:
08cd707bad" into oc-dr1-dev-plus-aosp
am:
668919209b
Change-Id: Ifa5ed37d8e58f0e5039386f4f1881f8c5a174a72
Lei Yu [Thu, 15 Jun 2017 02:27:34 +0000 (02:27 +0000)]
Merge "Revert the time zone display name logic" into oc-dev am:
d9b1697b2d am:
49f35066a3
am:
09ad91ef2c
Change-Id: Ie02b9e293f471be00e266a8b94ec8ca943a3e6c2
Android Build Merger (Role) [Thu, 15 Jun 2017 02:23:26 +0000 (02:23 +0000)]
Merge "Merge "Revert the time zone display name logic" into oc-dev am:
d9b1697b2d am:
08cd707bad" into oc-dr1-dev-plus-aosp
Lei Yu [Thu, 15 Jun 2017 02:22:31 +0000 (02:22 +0000)]
Merge "Revert the time zone display name logic" into oc-dev am:
d9b1697b2d
am:
08cd707bad
Change-Id: I48b8b23c1a571361560492f38ba1795eb62a41ff
Lei Yu [Thu, 15 Jun 2017 02:19:30 +0000 (02:19 +0000)]
Merge "Revert the time zone display name logic" into oc-dev am:
d9b1697b2d
am:
49f35066a3
Change-Id: Ib6b1f0789f73340abacfa2f793bcab899cfb952b
Lei Yu [Thu, 15 Jun 2017 02:14:09 +0000 (02:14 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
am:
d9b1697b2d
Change-Id: I0b71a7b1e52c57658b7cef1521b16c15e1f2481d
Lei Yu [Thu, 15 Jun 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
am:
d9b1697b2d
Change-Id: I9f28c603a44290c49121bd06694a84dab73747be
Lei Yu [Thu, 15 Jun 2017 02:04:39 +0000 (02:04 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
Rob Carr [Thu, 15 Jun 2017 01:43:51 +0000 (01:43 +0000)]
Merge "Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev am:
03e61aa9bb am:
95332490fe" into oc-dr1-dev-plus-aosp
am:
baa53694ca
Change-Id: I43a34166ba5323f317f303fe7bd681f585a1e550
Rob Carr [Thu, 15 Jun 2017 01:41:32 +0000 (01:41 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev am:
03e61aa9bb am:
7329efef20
am:
5c1f55691a
Change-Id: Iccc42255b6953e513a61000383a94c323f44d370
Jorim Jaggi [Thu, 15 Jun 2017 01:09:58 +0000 (18:09 -0700)]
Actually do not hold WM lock while closing transaction
Test: go/wm-smoke
Test: Quick switch 100x, observe no delay
Change-Id: I46022a23f749c52ba7f46e105679d728277970bd
Fixes:
62444483
Android Build Merger (Role) [Thu, 15 Jun 2017 01:36:23 +0000 (01:36 +0000)]
Merge "Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev am:
03e61aa9bb am:
95332490fe" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Tue, 13 Jun 2017 18:54:04 +0000 (11:54 -0700)]
Use splashscreen if we can't fill horizontaly with snapshot
A gap at the right side of the snapshot looks pretty bad. Thus,
we use a splash screen in case there would be a gap on the right
side. However, we don't want to do this from recents as we'd
produce another flicker
Test: go/wm-smoke
Test: Open app portrait, go launcher, rotate, open app landscape
Test: Open app landscape, go launcher rotate, open app portrait
Fixes:
62094756
Change-Id: Iaf1fecced822685187477a4698fa6b67c6e485d7
Rob Carr [Thu, 15 Jun 2017 01:33:32 +0000 (01:33 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev am:
03e61aa9bb
am:
7329efef20
Change-Id: I3c36d3b869c86cac063791698affba3d4ed5597f
Rob Carr [Thu, 15 Jun 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev am:
03e61aa9bb
am:
95332490fe
Change-Id: I3d7286d72c04f120ade4b99800537498399137b9
Rob Carr [Thu, 15 Jun 2017 01:25:29 +0000 (01:25 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
am:
03e61aa9bb
Change-Id: I515d73407b9d38513102b67feaf3e2804567fcbf
Rob Carr [Thu, 15 Jun 2017 01:25:26 +0000 (01:25 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
am:
03e61aa9bb
Change-Id: I6c53bff8ecc906658a3f8e81acfb6cb2e241121a
Rob Carr [Thu, 15 Jun 2017 01:18:17 +0000 (01:18 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
qingxi [Wed, 14 Jun 2017 18:44:04 +0000 (11:44 -0700)]
Fix NPE for KeyguardEsimArea#isEsimLocked
Test: TreeHugger Robot
Bug:
62604222
Change-Id: I678ee2b2447617d76a1c3d30370a5de4156f7b06
(cherry picked from commit
2b06b0156dd9002f8745f1cd1dccd84ef9738aa5)
Qingxi Li [Thu, 15 Jun 2017 00:53:03 +0000 (00:53 +0000)]
Merge "Fix NPE for KeyguardEsimArea#isEsimLocked"
TreeHugger Robot [Wed, 14 Jun 2017 23:17:48 +0000 (23:17 +0000)]
Romain Guy [Wed, 14 Jun 2017 23:06:18 +0000 (23:06 +0000)]
Merge "Use RGBA16F layers when wide color gamut rendering is on" into oc-dr1-dev am:
9ae7bb7aa3
am:
feb1609657
Change-Id: Icc5ea6789affa4c8cf09051add0ed78fe2a2e9d1
Romain Guy [Wed, 14 Jun 2017 22:58:30 +0000 (22:58 +0000)]
Merge "Use RGBA16F layers when wide color gamut rendering is on" into oc-dr1-dev
am:
9ae7bb7aa3
Change-Id: I9a2eca0ef845cf36decaf95ab40f57ec1c97b1fc
TreeHugger Robot [Wed, 14 Jun 2017 22:50:37 +0000 (22:50 +0000)]
Merge "Use RGBA16F layers when wide color gamut rendering is on" into oc-dr1-dev
Evan Laird [Wed, 14 Jun 2017 22:39:17 +0000 (22:39 +0000)]
Merge "Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev am:
38778637ad am:
7d4f7e8819" into oc-dr1-dev-plus-aosp
am:
de70f54249
Change-Id: I2220f760cae60e62ae045aec5e4d5ffd7daecdda
OSDN Git Service
