OSDN Git Service
Paul Duffin [Thu, 22 Feb 2018 15:26:08 +0000 (15:26 +0000)]
Merge changes I8e432950,Id325b8cf am:
919ff2268b
am:
9eec0a5c0e
Change-Id: Ie067d44d602ecaf13fd5ea1101b87807193733e9
Paul Duffin [Thu, 22 Feb 2018 15:16:30 +0000 (15:16 +0000)]
Merge changes I8e432950,Id325b8cf
am:
919ff2268b
Change-Id: I0912e9a426a5cc72e67b3ec55e2bbe195079eaf6
Mathew Inwood [Thu, 22 Feb 2018 14:29:23 +0000 (14:29 +0000)]
Merge "Package whitelist for hiddenapi checks." am:
9a50d75795
am:
3d2a3e25d3
Change-Id: I8e0120c77965a3d5784e61c7eabe5a8c4f88b1ea
Mathew Inwood [Thu, 22 Feb 2018 14:11:57 +0000 (14:11 +0000)]
Merge "Package whitelist for hiddenapi checks."
am:
9a50d75795
Change-Id: Iad8ccab4d46677320c9d39f73e6bbc67262c18b2
Treehugger Robot [Thu, 22 Feb 2018 13:39:10 +0000 (13:39 +0000)]
Merge changes I8e432950,Id325b8cf
* changes:
Build android.test.base/legacy against SDK
Fix visibility issues with android.test.mock.stubs
Mathew Inwood [Thu, 22 Feb 2018 12:57:48 +0000 (12:57 +0000)]
Merge "Package whitelist for hiddenapi checks."
Mathew Inwood [Fri, 16 Feb 2018 11:49:20 +0000 (11:49 +0000)]
Package whitelist for hiddenapi checks.
Some packages in the system image are not built against the SDK, so
enforcing hiddenapi checks for these will break them. Add a whitelist
for such packages.
For now, just add the contacts provider to the whitelist. The list will be
further populated later.
Test: Added test app package name to whitelist to verify.
Bug:
73244707
Merged-In: I94746b7f12dd9371d5068bb235eb853f63ee4d97
Change-Id: I1cbbd220c61b1b4b767c301f97096607ee902a7b
Pengquan Meng [Thu, 22 Feb 2018 07:14:43 +0000 (07:14 +0000)]
Merge "Cleanup TelephonyManager's log" am:
033de4676b
am:
22f61111bd
Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f
Pengquan Meng [Thu, 22 Feb 2018 07:02:54 +0000 (07:02 +0000)]
Merge "Cleanup TelephonyManager's log"
am:
033de4676b
Change-Id: I808ab4b142afcbf6c752b7f4f24d60500ab1cb51
Pengquan Meng [Thu, 22 Feb 2018 05:19:11 +0000 (05:19 +0000)]
Merge "Cleanup TelephonyManager's log"
Hall Liu [Thu, 22 Feb 2018 03:54:18 +0000 (03:54 +0000)]
Merge "EMBMS API tweaks" am:
47e1d11b47
am:
3b40c709a3
Change-Id: I8b281f717d3862a9f7a5de3d834dcded4ac436dc
Hall Liu [Thu, 22 Feb 2018 03:36:12 +0000 (03:36 +0000)]
Merge "EMBMS API tweaks"
am:
47e1d11b47
Change-Id: Ie058b45f2dd09b80a51cb9702155e45f49005173
Hall Liu [Thu, 22 Feb 2018 00:35:51 +0000 (00:35 +0000)]
Merge "EMBMS API tweaks"
Hall Liu [Thu, 22 Feb 2018 00:34:03 +0000 (00:34 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
31230bb193
am:
f581580fdb
Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607
Chris Tate [Thu, 22 Feb 2018 00:16:40 +0000 (00:16 +0000)]
Merge "Explicitly restart the killed wallpaper service" am:
0780b18a9f
am:
9298af376a
Change-Id: If3cd3217c2d9f42772e0f276c1bc3c1380ac149f
Hall Liu [Thu, 22 Feb 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Check for location access on TelephonyRegistry"
am:
31230bb193
Change-Id: I6827b337d9bcc2c634d873e03895c5997cca374c
Chris Tate [Thu, 22 Feb 2018 00:06:25 +0000 (00:06 +0000)]
Merge "Explicitly restart the killed wallpaper service"
am:
0780b18a9f
Change-Id: I7759fc380ef9555cb58f9ab593248e69cd798c70
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:15:30 +0000 (23:15 +0000)]
Merge "Fix low probability deadlock" am:
bb5cbc539f
am:
e05aa02d59
Change-Id: I3560bd28b67fee381f6c2d9e8bc8864efe63090d
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:01:42 +0000 (23:01 +0000)]
Merge "Fix low probability deadlock"
am:
bb5cbc539f
Change-Id: Ife7dd96618b75fd492aaf0397870653d63cf0d5e
Hall Liu [Wed, 21 Feb 2018 22:42:08 +0000 (22:42 +0000)]
Merge "Check for location access on TelephonyRegistry"
Chris Tate [Wed, 21 Feb 2018 21:49:31 +0000 (21:49 +0000)]
Merge "Explicitly restart the killed wallpaper service"
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 21:16:44 +0000 (21:16 +0000)]
Merge "Fix low probability deadlock"
Paul Duffin [Wed, 14 Feb 2018 10:36:16 +0000 (10:36 +0000)]
Build android.test.base/legacy against SDK
android.test.legacy is now build against SDK, thus available to apps
build with SDK.
In doing so, android.test.mock.stubs had to be built with SDK (because
it is used by android.test.legacy). However, this wasn't trivial.
The problem was that some classes in test-mock implemented abstract
methods of platform classes. Even though they are marked as @hide,
doclava automatically emit them to the stub file because otherwise the
class in the stub file does not implement some abstract methods from its
parent class, which in turn makes the stub file non-compilable.
This CL solves the problem by introducing an adapter class in between
the class in test-mock and the class in the framework. The adapter class
implements abstract methods which are @hide and having reference to
types that aren't available to SDK. The abstract methods are removed
from the original class. Then doclava does not emit the abstract
methods.
Also by @hide'ing the adapter classes, they are not compiled when
building the stub library.
Bug:
30188076
Bug:
73339598
Test: m -j android.test.base
Test: m -j android.test.legacy
Test: m -j android.test.mock.stubs
are successful and do not show link-check warning
Merged-In: I8e432950e693ee3c6f0240852e62da6133d31571
Change-Id: I8e432950e693ee3c6f0240852e62da6133d31571
Pengquan Meng [Wed, 21 Feb 2018 03:09:10 +0000 (19:09 -0800)]
Cleanup TelephonyManager's log
Don't log success calls to TelephonyManager.setTelephonyProperty.
Bug:
71514398
Test: manual test
Change-Id: I2383f1e2925bff959c3d925d7fdc8be891630c61
yifan.bai [Fri, 22 Dec 2017 06:59:57 +0000 (14:59 +0800)]
Fix low probability deadlock
Low probability deadlock in com.android.phone and system_server.
Bug:
70865607
Test: Build pass
Robert Sesek [Wed, 21 Feb 2018 02:33:14 +0000 (02:33 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote." am:
1c81aa6375
am:
486190f87b
Change-Id: I683dbbf730bfd02e43cb67bfcaa0df56d69c9796
Robert Sesek [Wed, 21 Feb 2018 02:16:22 +0000 (02:16 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote."
am:
1c81aa6375
Change-Id: I2af77c52ea7aca058ab1a1fc224968760e6c3ac5
Hall Liu [Tue, 6 Feb 2018 19:36:17 +0000 (11:36 -0800)]
EMBMS API tweaks
Make changes per API council recommendations
Also clean up the download flow -- provide option for app to specify a
destination as long as it's on the same filesystem.
Bug:
72837388
Fixes:
72231372
Test: CTS and testapp
Change-Id: Ia2a68a73e6d61f426b55068542a66995afc20407
Treehugger Robot [Wed, 21 Feb 2018 00:43:56 +0000 (00:43 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote."
Torne (Richard Coles) [Wed, 21 Feb 2018 00:17:22 +0000 (00:17 +0000)]
Merge "Consider shared libs when precreating WebView classloader." am:
f9fd8dfcc0
am:
424f3ab432
Change-Id: I21f031e97f750b8837eb9c698005fd3f112631ca
Torne (Richard Coles) [Wed, 21 Feb 2018 00:03:58 +0000 (00:03 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
am:
f9fd8dfcc0
Change-Id: I2e326ffb47a95c01bf5e67320bbf8aa8193916af
Brad Ebinger [Tue, 20 Feb 2018 23:20:48 +0000 (23:20 +0000)]
Merge "Add new reason code for call failed by unobtainable number" am:
4122fd23dc
am:
ffe0e51f47
Change-Id: I9b706c18b2d184b303adb526ee7adf86dd7e9ee9
Pankaj Kanwar [Tue, 20 Feb 2018 23:13:33 +0000 (23:13 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" am:
8343a47035
am:
de9585fe28
Change-Id: I11bcc2948e8efeea731299c5b8d642e155c1a2d5
nharold [Tue, 20 Feb 2018 23:07:53 +0000 (23:07 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am:
6d5aea8811
am:
ad96984eb5
Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157
Brad Ebinger [Tue, 20 Feb 2018 23:02:55 +0000 (23:02 +0000)]
Merge "Add new reason code for call failed by unobtainable number"
am:
4122fd23dc
Change-Id: Ib390ec02187fd27687dddc334bf2fcc791012c8e
Pankaj Kanwar [Tue, 20 Feb 2018 22:57:52 +0000 (22:57 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
am:
8343a47035
Change-Id: I4940e0ba4e86db861c75e910329aaf8fadd0e7e1
nharold [Tue, 20 Feb 2018 22:55:38 +0000 (22:55 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am:
6d5aea8811
Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
Robert Sesek [Wed, 17 Jan 2018 23:48:18 +0000 (18:48 -0500)]
Reparent the webview_zygote to be a child of the main app_process zygote.
This uses the new ZygoteProcess.startChildZygote() method to launch the
webview_zygote, rather than having init start it. This will share more
memory between the app_process and the webview_zygote, reducing the
overall system footprint.
Bug:
63749735
Test: m
Test: Launch "Third-party licenses" activity from Settings, and it
renders correctly via the WebView.
Change-Id: I3e39cd8adb9c099c92ee34640428916d90cb2b8f
Treehugger Robot [Tue, 20 Feb 2018 21:59:54 +0000 (21:59 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
Brad Ebinger [Tue, 20 Feb 2018 21:00:08 +0000 (21:00 +0000)]
Merge "Add new reason code for call failed by unobtainable number"
Pankaj Kanwar [Tue, 20 Feb 2018 20:48:12 +0000 (20:48 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
Torne (Richard Coles) [Tue, 19 Sep 2017 19:21:29 +0000 (15:21 -0400)]
Consider shared libs when precreating WebView classloader.
The change to handling of the deprecated Apache HTTP library means that
the WebView implementation package might have a non-empty shared library
list. Make sure to fetch shared libraries when querying WebView
implementations, and take them into account when constructing both the
actual classpath to be used to precreate the classloader, and when
deciding what the cache key for the precreated classloader should be.
Change-Id: I5e1409358d935e1c9f325db434bc6d4ef8ead759
Merged-In: I5e1409358d935e1c9f325db434bc6d4ef8ead759
Fixes:
65574359
Test: launch anything that uses WebView
(cherry picked from commit
4fd8aa51e4de5a7c93841571e30ff10077d1b125)
Mathieu Chartier [Tue, 20 Feb 2018 20:40:00 +0000 (20:40 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot" am:
0ea144f4bf
am:
8deca3f06f
Change-Id: Idefc228d35212f4014e9bb204e54b58c904ee94c
Bruno Martins [Tue, 20 Feb 2018 20:34:09 +0000 (20:34 +0000)]
Merge "WifiTile: Avoid NPE during boot phase" am:
b23150ffa9
am:
0d90a0690b
Change-Id: I65e814b392cc0891f970223c2ded27c7420205dc
Mathieu Chartier [Tue, 20 Feb 2018 20:26:00 +0000 (20:26 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot"
am:
0ea144f4bf
Change-Id: Icdd5128db27b701e76656f1e3e5ae230dbd15daa
Bruno Martins [Tue, 20 Feb 2018 20:20:51 +0000 (20:20 +0000)]
Merge "WifiTile: Avoid NPE during boot phase"
am:
b23150ffa9
Change-Id: Ib4748cb4814e4f6f1c5e7579284522ac55df329f
nharold [Tue, 20 Feb 2018 19:17:23 +0000 (19:17 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
Mathieu Chartier [Tue, 20 Feb 2018 19:12:38 +0000 (19:12 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot"
Bill Yi [Tue, 20 Feb 2018 18:14:20 +0000 (18:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
646773f4ef -s ours
Change-Id: If7c5be44c3912e481e85103c0b6bc9f11f08381a
TreeHugger Robot [Tue, 20 Feb 2018 18:01:54 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
David Brazdil [Tue, 20 Feb 2018 16:08:41 +0000 (16:08 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am:
4a8fa52e4b
am:
b459c66fca
Change-Id: Ic9aac96f55b4eb947b5af78a6b8482638a806ae5
David Brazdil [Tue, 20 Feb 2018 15:54:28 +0000 (15:54 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
am:
4a8fa52e4b
Change-Id: Ie94241b7b44a98fea1753f7aa58475384cb33800
Treehugger Robot [Tue, 20 Feb 2018 15:23:04 +0000 (15:23 +0000)]
Merge "WifiTile: Avoid NPE during boot phase"
David Brazdil [Tue, 20 Feb 2018 14:36:18 +0000 (14:36 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
Bill Yi [Tue, 20 Feb 2018 07:47:19 +0000 (07:47 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev am:
a1f536e00e am:
ff1a55a207
am:
7252081be1
Change-Id: I3ab38999b143631c39cd25a2e21b4d6ad766a486
Bill Yi [Tue, 20 Feb 2018 07:41:05 +0000 (07:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639 am:
7b73069b0a -s ours am:
6f40fc77e6 -s ours
am:
a3f97b668e -s ours
Change-Id: I5da2857e1fd4ea8db5053d5658b3b07c00f05fd0
Bill Yi [Tue, 20 Feb 2018 05:39:40 +0000 (21:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2f3e741047207c9948bbda977800e4a10b5797c1
Bill Yi [Tue, 20 Feb 2018 05:26:01 +0000 (05:26 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev am:
dd05e2d932 am:
ea5b2a818d
am:
5b8e6195a0
Change-Id: I34e8850eaa89f769957fa5b17f4d5cc823871292
Bill Yi [Tue, 20 Feb 2018 05:25:11 +0000 (05:25 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev am:
a1f536e00e
am:
ff1a55a207
Change-Id: Ibcd4efc7c50a91c6dd401436a2d82171793e0e6b
Bill Yi [Tue, 20 Feb 2018 05:19:47 +0000 (05:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639 am:
7b73069b0a -s ours
am:
6f40fc77e6 -s ours
Change-Id: I9f0d46d5dcd235ab83f52cfe6b21ad780d8404c5
Bill Yi [Tue, 20 Feb 2018 05:19:44 +0000 (05:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc am:
023ae30cdd -s ours am:
16e78b6dc1 -s ours
am:
e16f27b3fc -s ours
Change-Id: Ib6702b93752a79c08d16bf5035435f14b7e0c350
Bill Yi [Tue, 20 Feb 2018 05:13:43 +0000 (05:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653 am:
42e8a0c2de -s ours am:
da0d89bf92 -s ours
am:
f81de61e4e -s ours
Change-Id: I37cf66df3213345c876db85f399dfb7c82f917bb
Bill Yi [Tue, 20 Feb 2018 05:12:59 +0000 (05:12 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev am:
dd05e2d932
am:
ea5b2a818d
Change-Id: I824e17d5fcf0fcd7865d151a7d32b4991f045399
Bill Yi [Tue, 20 Feb 2018 05:09:31 +0000 (05:09 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
am:
a1f536e00e
Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058
Bill Yi [Tue, 20 Feb 2018 05:08:15 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
am:
7b73069b0a -s ours
Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf
Bill Yi [Tue, 20 Feb 2018 05:08:10 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc am:
023ae30cdd -s ours
am:
16e78b6dc1 -s ours
Change-Id: I67ed476e1375dba6a1c5864f561498c9e259c052
Bill Yi [Tue, 20 Feb 2018 05:03:09 +0000 (05:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653 am:
42e8a0c2de -s ours
am:
da0d89bf92 -s ours
Change-Id: I76ad6438afad284c3eed8d4a86111870865a7253
Bill Yi [Tue, 20 Feb 2018 05:02:56 +0000 (05:02 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
am:
dd05e2d932
Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6
Bill Yi [Tue, 20 Feb 2018 05:01:34 +0000 (05:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
am:
023ae30cdd -s ours
Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e
Bill Yi [Tue, 20 Feb 2018 04:56:46 +0000 (04:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
am:
42e8a0c2de -s ours
Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28
TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Import translations. DO NOT MERGE
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Import translations. DO NOT MERGE
pkanwar [Mon, 19 Feb 2018 18:33:33 +0000 (10:33 -0800)]
Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false
Bug:
73609752
Test: compile
Change-Id: Ie9615e63d136f40ee301504b3e2b3b7ea4aec129
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:18 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:12 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19
Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
Paul Duffin [Mon, 19 Feb 2018 16:34:08 +0000 (16:34 +0000)]
Merge "Turn on DepAnn for test-base and test-runner" am:
8dbbc3543e
am:
38a916fb74
Change-Id: I6508127afc4434f33533c2dd13db17db092e9788
Paul Duffin [Mon, 19 Feb 2018 16:24:57 +0000 (16:24 +0000)]
Merge "Turn on DepAnn for test-base and test-runner"
am:
8dbbc3543e
Change-Id: Ia6fe0967f92b382042326c288d175c4f60b63190
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:26 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:19 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8
Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14
Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
David Brazdil [Mon, 19 Feb 2018 15:39:15 +0000 (15:39 +0000)]
Add flag to AMS.startInstrumentation() to disable hidden API checks
Some tests need to use hidden APIs to check the internal state of
the framework. For those special use cases, we add a new flag to
ActivityManagerService.startInstrumentation that enables to start
instrumented processes without hidden API enforcement. Individual
test harnesses can change their Am command to request the exemption.
Bug:
64382372
Test: adb shell am instrument --no-hidden-api-checks <component>
adb logcat | grep 'Accessing hidden'
Merged-In: I1d734a95423fae90dae63ff09d5f606495830905
Change-Id: Ifbb0d19d95737a9f601b11e20352cdc11f0ca5b6
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:11 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:03 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530
Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
Paul Duffin [Mon, 19 Feb 2018 13:03:56 +0000 (13:03 +0000)]
Merge "Turn on DepAnn for test-base and test-runner"
haoyu li [Wed, 22 Nov 2017 03:49:49 +0000 (12:49 +0900)]
Add new reason code for call failed by unobtainable number
To show the "Invalid number" on the end call screen when user makes a
IMS call with unobtainable number, this reason code is used.
Test: manual - Checked that "Invalid number" is shown when make the IMS
MO call to unobtainable number.
Bug:
69940434
Change-Id: If3c54e6f55850141efad56ad7712db3c82a14f43
Chalard Jean [Mon, 19 Feb 2018 08:24:47 +0000 (08:24 +0000)]
Merge changes Ic28c5653,Ic635f97b am:
1ea3d9411a
am:
27dbc898dc
Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5
Chalard Jean [Mon, 19 Feb 2018 08:14:19 +0000 (08:14 +0000)]
Merge changes Ic28c5653,Ic635f97b
am:
1ea3d9411a
Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de
Tetsutoki Shiozawa [Fri, 2 Feb 2018 05:18:43 +0000 (14:18 +0900)]
Explicitly restart the killed wallpaper service
Symptom:
Live wallpaper setting was reset when a wallpaper service was killed
by Lmk. The wallpaper fell back to the default image wallpaper. It's
a black bitmap.
Root cause:
When restarting wallpaper service takes more than 10 seconds, it's
treated as a bad wallpaper. The wallpaper setting is reset to remove
the bad wallpaper.
This is not a suitable solution under the low memory situation.
Multiple processes are killed by Lmk at one time. Killed services are
automatically restarted by AMS with a few seconds interval.
The restart interval is increased by a factor of the number of killed
services. Sometimes, it takes more than 1 minute.
Solution:
When a wallpaper service is killed, WallpaperManagerService requests
restarting the service immediately. It can ignore the restart interval.
Bug:
73071020
Change-Id: Id5bb1cf121029a513f8773597f296b47667d1e21
Chalard Jean [Mon, 19 Feb 2018 04:01:17 +0000 (04:01 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests." am:
114278c9eb
am:
a6f193162a
Change-Id: Ib3e0e89a9d80546fbf3555cfdf715f2bd8e4ab94
Chalard Jean [Mon, 19 Feb 2018 03:54:25 +0000 (03:54 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests."
am:
114278c9eb
Change-Id: I094ad8f9764f5cd657e2fe98c846710c8d241b64
Treehugger Robot [Mon, 19 Feb 2018 03:45:27 +0000 (03:45 +0000)]
Merge changes Ic28c5653,Ic635f97b
* changes:
[LT2] Fix release request while lingering.
[LT1] Add a test for release request while lingering
Chalard Jean [Mon, 19 Feb 2018 02:13:48 +0000 (02:13 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests."
Chalard Jean [Fri, 16 Feb 2018 07:08:35 +0000 (16:08 +0900)]
[LT2] Fix release request while lingering.
Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4
Chalard Jean [Mon, 19 Feb 2018 01:57:09 +0000 (01:57 +0000)]
Merge "DO NOT MERGE : fix useless import" am:
473b3b7f03 -s ours
am:
b68ce4b33e -s ours
Change-Id: I75fc8e73f448ffee44a28149843c1d08399e255e
Chalard Jean [Mon, 19 Feb 2018 01:51:39 +0000 (01:51 +0000)]
Merge "DO NOT MERGE : fix useless import"
am:
473b3b7f03 -s ours
Change-Id: Ic717c478266a317fab1c618bc2a894e6610ffdd4
Chalard Jean [Sun, 18 Feb 2018 23:14:42 +0000 (23:14 +0000)]
Merge "DO NOT MERGE : fix useless import"
Bill Yi [Sun, 18 Feb 2018 17:12:57 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE
am:
2604d97ab6 -s ours
Change-Id: I0b5e8523e8e43ce3fd58c14e9be9423b1e58c2a6
Paul Duffin [Tue, 19 Dec 2017 15:11:47 +0000 (15:11 +0000)]
Fix visibility issues with android.test.mock.stubs
This ensures that the API definitions for the android.test.mock package
matches the definitions in the api/current.txt file.
Bug:
30188076
Test: make update-api
(cherry-picked from commit
bd97e3dd4e5d395f336114016b000ef3cfb26053)
Merged-In: Id325b8cf2f189117ac4cfe7634095ab710eee004
Change-Id: Id325b8cf2f189117ac4cfe7634095ab710eee004
OSDN Git Service
