OSDN Git Service
Sunny Goyal [Tue, 9 Oct 2018 22:25:08 +0000 (15:25 -0700)]
Using application context in static instance of LatencyTracker
to avoid context leak
Test: Verified on device
Bug:
117515648
Change-Id: If5ad93f9ab41c9bea32030fb46fc605f3a193cfd
TreeHugger Robot [Tue, 2 Oct 2018 21:14:54 +0000 (21:14 +0000)]
Merge "Make TIME_TICK an unordered broadcast"
Todd Kopriva [Tue, 2 Oct 2018 20:59:57 +0000 (13:59 -0700)]
Merge "docs: bug
37130805, typo" into pi-dev am:
7c5c4d1ca8
am:
0afec3a1ba
Change-Id: Ia83041c3b857d313d6e40f53cd0de3d4d68f85ef
Fabian Kozynski [Tue, 2 Oct 2018 20:30:42 +0000 (20:30 +0000)]
Merge "Fix crash when there's only one QQS tile"
Todd Kopriva [Tue, 2 Oct 2018 20:21:59 +0000 (13:21 -0700)]
Merge "docs: bug
37130805, typo" into pi-dev
am:
7c5c4d1ca8
Change-Id: I687b0cd961d714a012e389122d01271800ddc376
TreeHugger Robot [Tue, 2 Oct 2018 20:19:17 +0000 (20:19 +0000)]
Merge "Synchronize ZenModeControllerImpl callbacks"
Marcin Oczeretko [Tue, 2 Oct 2018 19:55:48 +0000 (19:55 +0000)]
Merge "Make BinderCallsStats ignore invalid sampling interval"
Gus Prevas [Tue, 2 Oct 2018 19:52:59 +0000 (19:52 +0000)]
Merge "Shortens "Manage notifications" link to "Manage"."
Salvador Martinez [Tue, 2 Oct 2018 19:52:17 +0000 (19:52 +0000)]
Merge "Update triggering to not double trigger at severe threshold"
Christopher Tate [Fri, 28 Sep 2018 23:23:10 +0000 (16:23 -0700)]
Make TIME_TICK an unordered broadcast
TIME_TICK is a foreground broadcast that goes only to registered
receivers, but was being dispatched via the ordered queue as a side-
effect of being sent directly as an alarm operation. We now use a
direct method-call alarm as the trigger and send it as an unordered
broadcast instead. This eliminates the potential for observed issues
of slow TIME_TICK handling leading to significant latencies for
subsequent foreground-priority broadcasts such as live phone call
flows.
Bug:
111404343
Bug:
116719392
Test: atest CtsAlarmManagerTestCases
Test: 'dumpsys activity broadcasts' and observe that TIME_TICK
is no longer being dispatched as "ordered=true"
Change-Id: I9c768668aaf6447221c905969ee6948e81958eb0
Todd Kopriva [Tue, 2 Oct 2018 19:03:29 +0000 (19:03 +0000)]
Merge "docs: bug
37130805, typo" into pi-dev
Leif Hendrik Wilden [Tue, 2 Oct 2018 18:25:36 +0000 (11:25 -0700)]
Merge "Allow wifi and ethenet connected at same time." am:
54d34fe8a7 am:
1bceeaac85
am:
bf1f2c455e
Change-Id: I36b924ac20ebe58dc2a522509b83a341994ff480
Oscar Shu [Tue, 2 Oct 2018 18:11:47 +0000 (18:11 +0000)]
Merge "proto change for wifi link layer usage stats"
Leif Hendrik Wilden [Tue, 2 Oct 2018 18:06:14 +0000 (11:06 -0700)]
Merge "Allow wifi and ethenet connected at same time." am:
54d34fe8a7
am:
1bceeaac85
Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f
TreeHugger Robot [Tue, 2 Oct 2018 18:03:23 +0000 (18:03 +0000)]
Merge "Disable blending for opaque TextureView"
TreeHugger Robot [Tue, 2 Oct 2018 17:58:14 +0000 (17:58 +0000)]
Merge "Read OEM customization XML"
Leif Hendrik Wilden [Tue, 2 Oct 2018 17:57:11 +0000 (10:57 -0700)]
Merge "Allow wifi and ethenet connected at same time."
am:
54d34fe8a7
Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
TreeHugger Robot [Tue, 2 Oct 2018 17:50:50 +0000 (17:50 +0000)]
Merge "Removed afm.notifyValueChanged() optimization."
Ryan Mitchell [Tue, 2 Oct 2018 17:23:32 +0000 (17:23 +0000)]
Merge "Use empty data if file in zip has length 0"
Makoto Onuki [Tue, 2 Oct 2018 17:15:39 +0000 (17:15 +0000)]
Merge "Revert "Add RawContacts insert/update/delete notification URIs.""
Treehugger Robot [Tue, 2 Oct 2018 17:09:16 +0000 (17:09 +0000)]
Merge "Allow wifi and ethenet connected at same time."
Salvador Martinez [Tue, 2 Oct 2018 16:24:04 +0000 (16:24 +0000)]
Merge "Add new POWER_SAVER permission & update api"
TreeHugger Robot [Tue, 2 Oct 2018 16:14:30 +0000 (16:14 +0000)]
Merge "Make LooperStatsService ignore invalid sampling interval"
Makoto Onuki [Tue, 2 Oct 2018 15:32:50 +0000 (15:32 +0000)]
Merge "Allow default SMS app to be always running"
TreeHugger Robot [Tue, 2 Oct 2018 15:30:52 +0000 (15:30 +0000)]
Merge changes from topic "am_launch_times"
* changes:
AM: Update WaitResult parsing logic in AppLaunch
AM: Use ActivityMetricsLogger to get app launch times
Gus Prevas [Thu, 27 Sep 2018 19:26:22 +0000 (15:26 -0400)]
Shortens "Manage notifications" link to "Manage".
Test: manual
Change-Id: I3af98ea14ac8c65afffbb6e28297598cbb648c66
Fixes:
115531288
Marcin Oczeretko [Tue, 2 Oct 2018 15:17:43 +0000 (16:17 +0100)]
Make BinderCallsStats ignore invalid sampling interval
System Server crashes with ArithmeticException if sampling
interval is set to 0.
Test: Manual
Change-Id: Ia8f5437f5c1cdc68bed607147049abd70ed7af33
TreeHugger Robot [Tue, 2 Oct 2018 15:04:25 +0000 (15:04 +0000)]
Merge changes I1276375c,I3fd96558,I39f7b1af
* changes:
Remove detached wallpaper animations
Remove WSA.mAnimLayer
Remove WindowStateAnimator.isAnimationSet
Fabian Kozynski [Tue, 2 Oct 2018 13:18:52 +0000 (09:18 -0400)]
Fix crash when there's only one QQS tile
Test: runtest & manual (adb)
Change-Id: I5a48f69a0650fecea47e755bf0ba1124e1150db9
Fixes:
117101187
Marcin Oczeretko [Tue, 2 Oct 2018 14:35:44 +0000 (15:35 +0100)]
Make LooperStatsService ignore invalid sampling interval
System Server crashes with ArithmeticException if sampling
interval is set to 0.
Test: Manual
Bug:
113651685
Change-Id: I632c56fc0cddbf426bb8369269cd4990ceee6e58
TreeHugger Robot [Tue, 2 Oct 2018 14:03:35 +0000 (14:03 +0000)]
Merge "Add the metalava_enabled property"
Jorim Jaggi [Tue, 14 Aug 2018 15:00:20 +0000 (17:00 +0200)]
Remove detached wallpaper animations
Wasn't really supported anymore. Let's remove it from the API.
Bug:
112628612
Change-Id: I1276375cc204887a8da37a7f09ae2046216ca448
Jorim Jaggi [Tue, 14 Aug 2018 15:00:20 +0000 (17:00 +0200)]
Remove WSA.mAnimLayer
Wasn't set at all. Can be safely removed without changing any
logic.
Also removes a bunch of other stuff that's not used.
Test: go/wm-smoke
Change-Id: I3fd9655817a42f5361659e9f78f651074b568075
TreeHugger Robot [Tue, 2 Oct 2018 13:37:34 +0000 (13:37 +0000)]
Merge "Wifi Tile updates its label on Locale change"
Jorim Jaggi [Mon, 13 Aug 2018 14:40:49 +0000 (16:40 +0200)]
Remove WindowStateAnimator.isAnimationSet
Test: boots
Change-Id: I39f7b1afa852ed627d5a7d61d5d84724f1d76c05
Beverly [Tue, 2 Oct 2018 13:22:56 +0000 (09:22 -0400)]
Synchronize ZenModeControllerImpl callbacks
Test: manual
Bug:
115688927
Change-Id: Ib47913c7b5522c40405fadd97d570d5f197f71dc
TreeHugger Robot [Tue, 2 Oct 2018 13:16:20 +0000 (13:16 +0000)]
Merge "Fix crashes running android.appsecurity.cts.EphemeralTest"
TreeHugger Robot [Tue, 2 Oct 2018 13:07:25 +0000 (13:07 +0000)]
Merge "Device-wide unknown sources block option for DPC."
Fabian Kozynski [Tue, 2 Oct 2018 13:02:31 +0000 (13:02 +0000)]
Merge "Fix clipping on scrolling QS Panel"
Pavel Grafov [Tue, 2 Oct 2018 12:22:36 +0000 (05:22 -0700)]
[automerger skipped] Merge "Go via FgThread when starting the profiles during system boot." into pi-dev am:
98d4d5002b
am:
331a589684 -s ours
Change-Id: Ia9aae2481ea9400fc7f900c8382efb237542fe84
Pavel Grafov [Tue, 2 Oct 2018 12:11:54 +0000 (05:11 -0700)]
Merge "Go via FgThread when starting the profiles during system boot." into pi-dev
am:
98d4d5002b
Change-Id: I20324e15e9fcfac6a9bedba8f9815b6e19085d90
TreeHugger Robot [Tue, 2 Oct 2018 11:49:11 +0000 (11:49 +0000)]
Merge "Go via FgThread when starting the profiles during system boot." into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 11:28:41 +0000 (11:28 +0000)]
Merge "Fix: convert number of pages to bytes"
Stanley Tng [Tue, 2 Oct 2018 11:20:01 +0000 (04:20 -0700)]
[automerger skipped] Merge changes from topic "hearing-aid" into pi-dev am:
9c3f60d2f9
am:
ad7bbf12f5 -s ours
Change-Id: Ibfdf2816ddb497a297791aaa99563a8572da3405
Stanley Tng [Tue, 2 Oct 2018 11:15:06 +0000 (04:15 -0700)]
[automerger skipped] Add Feature Flag for Hearing Aid Profile am:
172efa1ed8 -s ours
am:
f0011cb973 -s ours
Change-Id: I087cac61d238c53e4a760ea80d680a19d3d557ce
Hansong Zhang [Tue, 2 Oct 2018 11:11:12 +0000 (04:11 -0700)]
[automerger skipped] Prevent NPE when profile is null am:
c3ea0d3f79
am:
cd9ee08bae -s ours
Change-Id: Ieb0da01e661a8bf91be34cb14f611f7765740bef
Stanley Tng [Tue, 2 Oct 2018 10:51:09 +0000 (03:51 -0700)]
Merge changes from topic "hearing-aid" into pi-dev
am:
9c3f60d2f9
Change-Id: Ie7580ef3e0a74011a274707f57d7cf0d0fa0ab3e
Stanley Tng [Tue, 2 Oct 2018 10:44:56 +0000 (03:44 -0700)]
[automerger skipped] Add Feature Flag for Hearing Aid Profile
am:
172efa1ed8 -s ours
Change-Id: Idd30524f53a8b3b2e8aee0cd63b048b862eb3002
Hansong Zhang [Tue, 2 Oct 2018 10:38:30 +0000 (03:38 -0700)]
Prevent NPE when profile is null
am:
c3ea0d3f79
Change-Id: I7db11fad7b6d40e56dbcd029eb960c139c3a3b0d
TreeHugger Robot [Tue, 2 Oct 2018 10:17:45 +0000 (10:17 +0000)]
Merge "Add isRootsUri method to check whether the roots uri is valid"
Rafal Slawik [Mon, 1 Oct 2018 15:06:39 +0000 (16:06 +0100)]
Fix: convert number of pages to bytes
According to man proc(5), the 24th field in /proc/pid/stat
is given in the number of pages (not bytes). Convert it to
bytes by multiplying by the default page size in Android.
Also, replace Long.valueOf with Long.parseLong to avoid
auto-unboxing and wrap parsing in a try-catch where need.
Change-Id: Ifb20120019bd962b6e8ce5b69d16853218f9575b
Fix:
115639792
Test: atest MemoryStatUtilTest
Stanley Tng [Tue, 2 Oct 2018 08:15:25 +0000 (01:15 -0700)]
[automerger skipped] Merge "Add Feature Flag for Hearing Aid Profile" into pi-dev-plus-aosp
am:
7f1263765f -s ours
Change-Id: I14c1da0a9ddc7b9dfbfda0a3fab79e46ee87e810
TreeHugger Robot [Tue, 2 Oct 2018 08:00:09 +0000 (08:00 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile" into pi-dev-plus-aosp
TreeHugger Robot [Tue, 2 Oct 2018 07:51:13 +0000 (07:51 +0000)]
Merge "Add DiskIo to Statsd"
Tej Singh [Fri, 21 Sep 2018 18:42:12 +0000 (11:42 -0700)]
Add DiskIo to Statsd
Adds diskio information to statsd. The puller queries the
proc/uid_io/stats file to get cumulative counts since boot.
Bug: b/
116331466
Test: unit test
Test: manually verified that the puller and "cat /proc/uid_io/stats"
returned almost identical output when executed at the same time
Change-Id: Iac446f8dd879ab6bf859eed6e779cc16fdee6c5b
Seigo Nonaka [Tue, 2 Oct 2018 02:06:11 +0000 (19:06 -0700)]
Read OEM customization XML
We now moved OEM font customization outside of system image and all
system font modifications are in /product directory.
In this CL, only customizationType="new-named-family" is supported.
My previous CL If58711fc038898175fcad0ae095865312bd738e2 breaks test
cases in CtsGraphicsTestCases but TreeHugger didn't catch my mistake
becasue the test cases are not annotated as Presubmit.
Bug:
111544833
Test: atest CtsGraphicsTestCases:android.graphics.fonts
Change-Id: I7a7a2d91d8f37c51944d598dde7562733eae5626
Chen Xu [Tue, 2 Oct 2018 05:04:00 +0000 (22:04 -0700)]
Merge "using the correct intent extra for subId" am:
45db25d742 am:
1ae9d0bced
am:
5fa139279b
Change-Id: I3054b7e14b291241d94056c9ffb9ea7af99041d1
Chen Xu [Tue, 2 Oct 2018 04:51:38 +0000 (21:51 -0700)]
Merge "using the correct intent extra for subId" am:
45db25d742
am:
1ae9d0bced
Change-Id: I4cf3ea508f0f06ecbf41216e5ea142b5fc1b5007
Stanley Tng [Tue, 19 Jun 2018 15:48:10 +0000 (08:48 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug:
116317072
Bug:
116044083
Test: Manual testing using Settings App
Merged-In: I58a9d339941e235242c443c85b6f4194b5a296c9
(cherry picked from commit
fe8c8337edc5e9d6b61d0942873538912d523db7)
Change-Id: I7d0b6759e7acba3fb2a4d1afdba35d5a95387777
Chen Xu [Tue, 2 Oct 2018 04:42:44 +0000 (21:42 -0700)]
Merge "using the correct intent extra for subId"
am:
45db25d742
Change-Id: Id5e89366c2851631f2696ae2f239b4917495afc7
Chen Xu [Tue, 2 Oct 2018 04:26:23 +0000 (04:26 +0000)]
Merge "using the correct intent extra for subId"
TreeHugger Robot [Tue, 2 Oct 2018 04:23:16 +0000 (04:23 +0000)]
Merge "Build com.android.media.remotedisplay with java_sdk_library"
Chih-hung Hsieh [Tue, 2 Oct 2018 01:59:22 +0000 (18:59 -0700)]
Merge "Add noexcept to move constructors and assignment operators." am:
9166e89374 am:
15dcc77fee
am:
07a7250da3
Change-Id: I74a6b6e53ba4f22b79b855e146aa260b2eaddb27
Eric Holk [Tue, 2 Oct 2018 01:52:48 +0000 (18:52 -0700)]
Merge "Prototype XML view compiler" am:
956791cee8 am:
dcdd224bc0
am:
2bee1b09fc
Change-Id: Ifecd800f41fa06a4fedad3e53cc3744619f326ff
Sundong Ahn [Mon, 17 Sep 2018 06:23:14 +0000 (15:23 +0900)]
Add the metalava_enabled property
The new property is added for supporting metalava. But some sdk library
cannot use metalava. So "metalava_enabled: false" is added to these
modules.
Test: make -j
Test: checkapi
Bug:
117127012
Change-Id: Ib65f3cd73dac0ac6ed64afeca6546d99739e4424
Chih-hung Hsieh [Tue, 2 Oct 2018 01:37:02 +0000 (18:37 -0700)]
Merge "Add noexcept to move constructors and assignment operators." am:
9166e89374
am:
15dcc77fee
Change-Id: I695e7a175051e2dd42d05c54d859e4d7126620aa
Eric Holk [Tue, 2 Oct 2018 01:31:53 +0000 (18:31 -0700)]
Merge "Prototype XML view compiler" am:
956791cee8
am:
dcdd224bc0
Change-Id: I1920a587ab1dfb66f78123f68932fb7c7969fa40
Arthur Ishiguro [Tue, 2 Oct 2018 01:29:02 +0000 (01:29 +0000)]
Merge "Adds new PendingIntent-based APIs for ContextHubManager"
Felipe Leme [Tue, 2 Oct 2018 01:00:40 +0000 (18:00 -0700)]
Removed afm.notifyValueChanged() optimization.
On Android P, TextView was keeping track of the last mText that was sent to
AutofillManager to avoid calling it again if the value didn't change, as that
would incur on unnecessary IPC calls from AFM to AFMService in the UIThread.
Now on Android Q this optimization is causing the method to not be called when
it should when the mText is a reference to a SpannableStringBuilder, as it's
equals() method now returns true in this case (before it was returning false,
which was a bug: if the reference didn't change, it should return true).
We have 2 options to solve this problem:
1.Fix TextView to keep a String copy of mText.
2.Remove the optimization.
This CL fixes it using #2, for 2 reasons:
1.On Android Q, the AFM calls to AFMS are async, so it's not a jankiness issue
anymore.
2.Making a copy will actually be *worse* for performance, as it would be making
an unnecessary copy for the cases where autofill is disabled.
Test: atest android.autofillservice.cts.DatasetFilteringTest#testFilter_usingKeyboard
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything
Fixes:
117106046
Change-Id: Ia1c69e2d7a478288f65566e862f4a43e88eca463
Chih-hung Hsieh [Tue, 2 Oct 2018 01:09:38 +0000 (18:09 -0700)]
Merge "Add noexcept to move constructors and assignment operators."
am:
9166e89374
Change-Id: I079060ef610c2d90c57140f001225c163a3dd21a
Eric Holk [Tue, 2 Oct 2018 01:05:31 +0000 (18:05 -0700)]
Merge "Prototype XML view compiler"
am:
956791cee8
Change-Id: I879bfc0b0755b22c1653a3d06dedc890c6c4b8a6
Pirama Arumuga Nainar [Tue, 2 Oct 2018 01:00:49 +0000 (18:00 -0700)]
Merge "Do not use StringPiece in ExtractJavaIdentifier" am:
20ecc6397b am:
206ccf1f61
am:
7472303ff4
Change-Id: Idd910ad9fb743093f8e43ddcdf5770722b4393e6
TreeHugger Robot [Tue, 2 Oct 2018 00:53:40 +0000 (00:53 +0000)]
Merge changes from topic "hearing-aid" into pi-dev
* changes:
Fix missing connection state changes intent for Hearing Aids
Add Feature Flag for Hearing Aid Profile
Prevent NPE when profile is null
Add isConnectedHearingAidDevice function to check if it supports Hearing Aid profile
Pirama Arumuga Nainar [Tue, 2 Oct 2018 00:48:38 +0000 (17:48 -0700)]
Merge "Do not use StringPiece in ExtractJavaIdentifier" am:
20ecc6397b
am:
206ccf1f61
Change-Id: I5f53337ae154c369d748ecb1693bfc6b57b5308e
TreeHugger Robot [Tue, 2 Oct 2018 00:48:26 +0000 (00:48 +0000)]
Merge "Allow Shell to access the clipboard"
Chih-hung Hsieh [Tue, 2 Oct 2018 00:37:46 +0000 (00:37 +0000)]
Merge "Add noexcept to move constructors and assignment operators."
Treehugger Robot [Tue, 2 Oct 2018 00:28:15 +0000 (00:28 +0000)]
Merge "Prototype XML view compiler"
Pirama Arumuga Nainar [Tue, 2 Oct 2018 00:25:02 +0000 (17:25 -0700)]
Merge "Do not use StringPiece in ExtractJavaIdentifier"
am:
20ecc6397b
Change-Id: I3c70a4b9db43d9590f52cdb6972cf9fba3501787
TreeHugger Robot [Tue, 2 Oct 2018 00:19:18 +0000 (00:19 +0000)]
Merge "Fix a race in AMS.getContentProviderImpl()."
TreeHugger Robot [Tue, 2 Oct 2018 00:04:18 +0000 (00:04 +0000)]
Merge "Add argument to specify query flags for pm query commands"
TreeHugger Robot [Tue, 2 Oct 2018 00:03:30 +0000 (00:03 +0000)]
Merge "WM: Mark RecentsAnimationControllerTest#testIncludedApps_expectTargetAndVisible as flaky"
TreeHugger Robot [Mon, 1 Oct 2018 23:43:40 +0000 (23:43 +0000)]
Merge "Add unit tests for ShellSubscriber and fix a bug"
Treehugger Robot [Mon, 1 Oct 2018 23:37:31 +0000 (23:37 +0000)]
Merge "Do not use StringPiece in ExtractJavaIdentifier"
Chad Brubaker [Mon, 1 Oct 2018 17:38:54 +0000 (10:38 -0700)]
Allow Shell to access the clipboard
A lot of CTS tests involve the clipboard and making all of them input
focus is somewhat wasteful and invasive, instead we will adopt the
shell's permissions when relevant.
Test: atest ClipboardManagerTest
Bug:
6229949
Change-Id: I10f07e89b0baead625464c2afd5da1e229a45473
Brad Ebinger [Mon, 1 Oct 2018 23:10:29 +0000 (16:10 -0700)]
[automerger skipped] Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev am:
18ee267409 -s ours
am:
fea12aa909 -s ours
Change-Id: I4dcdc01b6e169811313f0b97da344b27408e2d9e
Jack Yu [Mon, 1 Oct 2018 22:51:27 +0000 (15:51 -0700)]
[automerger skipped] Merge changes from topic "language_filtering" into pi-dev am:
46bdacd22f
am:
6ac4e148ec -s ours
Change-Id: I6d55e63facc7a4e9b927a1a1bc9994bc2e72c006
Brad Ebinger [Mon, 1 Oct 2018 22:46:36 +0000 (15:46 -0700)]
[automerger skipped] Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev
am:
18ee267409 -s ours
Change-Id: If1f8038f5ec6f4976fef334049a2bd8c59aa2b16
Brad Ebinger [Mon, 1 Oct 2018 22:36:06 +0000 (22:36 +0000)]
Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev
Vishnu Nair [Mon, 1 Oct 2018 22:35:41 +0000 (15:35 -0700)]
WM: Mark RecentsAnimationControllerTest#testIncludedApps_expectTargetAndVisible as flaky
Bug:
117117823
Test: RecentsAnimationControllerTest#testIncludedApps_expectTargetAndVisible
Change-Id: Iacd1248173f265ceca4cb6e7c602f42bf4a5abfa
Makoto Onuki [Mon, 1 Oct 2018 22:17:35 +0000 (15:17 -0700)]
Fix a race in AMS.getContentProviderImpl().
If the provider process has just been killed by AM but appDiedLocked()
hasn't been called yet, this method would wait on the wrong
ContentProviderRecord.
Bug:
110030490
Test: Manual test with the following test code added after
"boolean providerRunning = false".
if (cpr != null && cpr.proc != null) {
final String prop = "debug.am.provider.fake-kill." + cpr.proc.processName;
if (SystemProperties.getBoolean(prop, false)) {
cpr.proc.kill("fake-kill", true);
SystemProperties.set(prop, "0");
}
}
Change-Id: I2c4ba1e87c2d47f2013befff10c49b3dc337a9a7
Jack Yu [Mon, 1 Oct 2018 22:19:40 +0000 (15:19 -0700)]
Merge changes from topic "language_filtering" into pi-dev
am:
46bdacd22f
Change-Id: I721c9cc5f2c82bd6530d304bd679faa3b25cb134
TreeHugger Robot [Mon, 1 Oct 2018 22:02:28 +0000 (22:02 +0000)]
Merge changes from topic "language_filtering" into pi-dev
* changes:
Use locale language instead of harcoded langauge
Added new cell broadcast channels
Android Build Merger (Role) [Mon, 1 Oct 2018 21:58:50 +0000 (21:58 +0000)]
Merge "[automerger skipped] Merge "Revert isResolvingImsBinding ITelephony interface" am:
417b7b14bb -s ours am:
05fb3806f3 -s ours am:
12b3a7676d -s ours"
Brad Ebinger [Mon, 1 Oct 2018 21:57:05 +0000 (14:57 -0700)]
[automerger skipped] Merge "Revert isResolvingImsBinding ITelephony interface" am:
417b7b14bb -s ours am:
05fb3806f3 -s ours
am:
12b3a7676d -s ours
Change-Id: I528a26bd1e15a80035584a5c60722b2ebc7ed5a0
TreeHugger Robot [Mon, 1 Oct 2018 21:56:08 +0000 (21:56 +0000)]
Merge "Update wireless charging documentation val"
Yao Chen [Mon, 1 Oct 2018 21:49:03 +0000 (14:49 -0700)]
Add unit tests for ShellSubscriber and fix a bug
Test: statsd_test
Change-Id: Iaf0558ec2a2dc190bedb240da8019868266ec8f5
Salvador Martinez [Mon, 1 Oct 2018 18:31:43 +0000 (11:31 -0700)]
Update triggering to not double trigger at severe threshold
If the low threshold is not shown for any reason and we reach the
severe threshold and it does show it will double trigger. This CL
just makes it so both are marked as "shown" if the severe warning
is shown regardless of whether the low warning was shown or not.
Test: runtest systemui
Bug:
116716293
Change-Id: I7fff2d7beba7b37312b9a4c4951a68c3d1f1ba3f
Xiangyu/Malcolm Chen [Mon, 1 Oct 2018 21:47:19 +0000 (21:47 +0000)]
Merge "Add PhoneStateListener#onPreferredDataSubIdChanged"
chen xu [Fri, 28 Sep 2018 22:53:43 +0000 (15:53 -0700)]
using the correct intent extra for subId
Some telephony subscription related intent uses hidden extra
PhoneConstants.SUBSCRIPTION_KEY. We should sent the public extra
SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead.
Bug:
116754807
Test: telephony unit test
Change-Id: I842df9b3fa7c0c8efed2db6ac5cd6a8c34ab3ee4
TreeHugger Robot [Mon, 1 Oct 2018 21:43:42 +0000 (21:43 +0000)]
Merge "Deprecate InputMethodService#getInputMethodWindowRecommendedHeight()"