OSDN Git Service
TreeHugger Robot [Wed, 17 Oct 2018 00:56:19 +0000 (00:56 +0000)]
Merge "audio: apply volume upon hearing aid device connection" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 14:20:55 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:43:27 +0000 (13:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:33:18 +0000 (13:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:31:26 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:27:36 +0000 (13:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:26:19 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:25:42 +0000 (13:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:23:48 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:22:32 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 08:48:38 +0000 (01:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I99af1ea374e4648979862922f7adea5d8b91ff81
Bill Yi [Tue, 16 Oct 2018 08:42:01 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I213983e8a9a9f554aa6fc0002c55e31248278614
Bill Yi [Tue, 16 Oct 2018 06:50:41 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9da66855c6df5542a9d3273784941849a7d03693
Bill Yi [Tue, 16 Oct 2018 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib157bd713ff9c0ad8504ff13a4ff4b91c75454be
Bill Yi [Tue, 16 Oct 2018 05:31:12 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ice863cbfa1f7d3b678efc1c1c52023b1961e921a
Bill Yi [Tue, 16 Oct 2018 05:12:33 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I26eb9affa49e0ec4a33d8af15636133eb55c926a
Bill Yi [Tue, 16 Oct 2018 05:05:45 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib9833c6ccf62c26dfb73c08cd34b9a4d7178d7a9
Bill Yi [Tue, 16 Oct 2018 04:59:06 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibf26d2b592cef0d579248cf122af92251819fe41
Bill Yi [Tue, 16 Oct 2018 04:46:13 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I099acf9101592632383bc88dfff126c52f7965d0
Suren Baghdasaryan [Wed, 10 Oct 2018 21:22:20 +0000 (14:22 -0700)]
Request lmkd to purge its list of pids after establishing connection
lmkd keeps a list of pids registered by ActivityManager, however on rare
occasions when framework restarts and lmkd survives that list has to be
purged. Request lmkd to clear its pid list immediately after establishing
connection to it.
Bug:
116801366
Test: locally by killing zygote process
Change-Id: Id8c81e0cb0c4cf03b8faa0add5a9514fd3cd0c0c
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Jeff Sharkey [Fri, 12 Oct 2018 05:20:54 +0000 (22:20 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b
am:
7656e1177f -s ours
Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
Jeff Sharkey [Fri, 12 Oct 2018 05:19:39 +0000 (22:19 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7
am:
cef9bae62d -s ours
Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
Jeff Sharkey [Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c
am:
893598cd4b
Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
Jeff Sharkey [Fri, 12 Oct 2018 05:09:55 +0000 (22:09 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8
am:
80c65f6ce7
Change-Id: I824cd0b4b0bdb66f9762fb9123f639fe3548f164
Jeff Sharkey [Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am:
ab80221a8c
Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Jeff Sharkey [Fri, 12 Oct 2018 04:51:36 +0000 (21:51 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
am:
af72f01db8
Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
TreeHugger Robot [Fri, 12 Oct 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Recover shady content:// paths." into pi-dev
TreeHugger Robot [Thu, 11 Oct 2018 03:18:04 +0000 (03:18 +0000)]
Merge "Do not start VrManagerService if VR is not supported" into pi-dev
TreeHugger Robot [Thu, 11 Oct 2018 03:17:18 +0000 (03:17 +0000)]
Merge changes If834d0f0,I05ec75c7 into pi-dev
* changes:
Add null check for vrManager
Add null check for vrManager
TreeHugger Robot [Thu, 11 Oct 2018 03:17:12 +0000 (03:17 +0000)]
Merge "Add null check for vrManager" into pi-dev
Oscar Shu [Wed, 10 Oct 2018 19:42:55 +0000 (19:42 +0000)]
Merge "proto change for wifi link layer usage stats" into pi-dev
Eric Laurent [Wed, 10 Oct 2018 00:45:58 +0000 (17:45 -0700)]
audio: apply volume upon hearing aid device connection
make sure hearing aid device volume is applied to music stream upon
hearing aid device connection.
Bug:
116145308
Test: repro steps in bug
Change-Id: Iccf6a78a0199c3a0b2aa80a39e7143bf715b261f
kopriva [Tue, 9 Oct 2018 20:42:28 +0000 (13:42 -0700)]
docs: fixing errors found with lint checker
through /bluetooth directory
amending through /content directory
Test: make ds-docs
Bug:
117494359
Change-Id: I751e15d60f0b9cc441998b27560050bf62994fef
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 9 Oct 2018 20:04:29 +0000 (20:04 +0000)]
Merge "docs: fixing errors found with lint check" into pi-dev
kopriva [Tue, 9 Oct 2018 17:09:23 +0000 (10:09 -0700)]
docs: fixing errors found with lint check
This covers directories through /app.
removed unused import in KeyguardManager.java
Test: make ds-docs
Bug:
117494359
Change-Id: Ie2536676ae8d3ab9349aa43dc3e3248b618dd143
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 9 Oct 2018 05:47:20 +0000 (05:47 +0000)]
Merge "docs: bug
37128155, broken link" into pi-dev
Mike Ma [Tue, 9 Oct 2018 05:45:17 +0000 (05:45 +0000)]
Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 01:33:26 +0000 (01:33 +0000)]
Merge "docs: fixing 'mange' instead of 'manage'" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 01:31:08 +0000 (01:31 +0000)]
Merge "docs: bug
37007350, missing word" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 00:03:21 +0000 (00:03 +0000)]
Merge "Fix widget manager / alarm manager deadlock" into pi-dev
kopriva [Mon, 8 Oct 2018 22:57:00 +0000 (15:57 -0700)]
docs: fixing 'mange' instead of 'manage'
Test: make ds-docs
Bug:
117449040
Change-Id: I282a2e960bbf722bf3a72dd932e3bf685abb74e5
Exempt-From-Owner-Approval: Docs-only change
kopriva [Mon, 8 Oct 2018 22:21:07 +0000 (15:21 -0700)]
docs: bug
37007350, missing word
Test: make ds-docs
Bug:
37007350
Change-Id: Ibbff4232f67e7c955b182ff9f3b97250bb15c310
Exempt-From-Owner-Approval: Docs-only change
Kevin Hufnagle [Mon, 8 Oct 2018 20:20:18 +0000 (20:20 +0000)]
Merge "docs: Added callouts related to obsolete contacts data fields." into pi-dev
Kevin Hufnagle [Mon, 1 Oct 2018 14:04:44 +0000 (07:04 -0700)]
docs: Added callouts related to obsolete contacts data fields.
Also added callouts for fields that no longer sort results based on
contacts frequency.
Bug:
116422556
Test: make ds-docs -j32
Change-Id: I738e08bd4686e30b875fa37123ecebb4a5e179d3
Merged-In: Iddcd0b41b6ad991423a5ced78522a9ab2ad831a1
Mike Ma [Wed, 3 Oct 2018 18:07:08 +0000 (11:07 -0700)]
DO NOT MERGE: Fix signature of KernelCpuProcReader
Signatures of blacklist APIs were frozen with Pi release. Need to update
the signature manually for a change to KernelCpuProcReader introduced in
ag/
5055721.
Bug:
111805985
Fixes:
117089824
Test: Manual build
Test: HiddenApiTest#testSignature
Change-Id: I2918afa813417e05f3f0578575a7051fd147aa1a
Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]
RESTRICT AUTOMERGE: Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.
This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths. Consider this example:
<path-permission android:pathPrefix="/private" ... />
uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);
content://com.example//private
The Uri above will pass the security check, since it's not
technically a prefix match. But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.
Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.
Bug:
112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
Leo Hsu [Fri, 5 Oct 2018 01:06:42 +0000 (01:06 +0000)]
Merge changes from topics "remove_feature_flag_emergency", "faster_emergency_feature_flag" into pi-dev
* changes:
RESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
Add new metrics in power menu
Add feature flag in Settings.
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:44 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
Change-Id: I72c58f65bd2709e23d7631d2e0acc06b40a917f9
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:37 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665
Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:27 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac
Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:19 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c
Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:12 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd
Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c
Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]
RESTRICT AUTOMERGE: Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.
This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths. Consider this example:
<path-permission android:pathPrefix="/private" ... />
uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);
content://com.example//private
The Uri above will pass the security check, since it's not
technically a prefix match. But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.
Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.
Bug:
112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
kopriva [Thu, 4 Oct 2018 21:47:12 +0000 (14:47 -0700)]
docs: bug
37128155, broken link
Test: make ds-docs
Bug:
37128155
Change-Id: I39e432b6000b9c32ef62bc10f2d8ad343b9305f9
Exempt-From-Owner-Approval: Docs-only change
kopriva [Thu, 4 Oct 2018 21:09:04 +0000 (14:09 -0700)]
docs: bug
37127405, typo
Test: make ds-docs
Bug:
37127405
Change-Id: I40892ad7248d95a562d6af448ce4d475c79fd19f
Exempt-From-Owner-Approval: Docs-only change
Andrew Solovay [Thu, 4 Oct 2018 20:06:59 +0000 (20:06 +0000)]
Merge "docs: Replacing {#link with {@link" into pi-dev
Andrew Solovay [Tue, 2 Oct 2018 21:14:42 +0000 (14:14 -0700)]
docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.
Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.
Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.
Staged to:
go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html
(Other files were not in the public Javadocs.)
Bug:
111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Wayne Lin [Thu, 4 Oct 2018 18:09:05 +0000 (11:09 -0700)]
[automerger skipped] resolve merge conflicts of
3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev am:
fd6df001e0 -s ours
am:
95fe3f8cba -s ours
Change-Id: Ic6b0f8a9d64a9c19ff000ef76f2702327dfa9c64
Wayne Lin [Thu, 4 Oct 2018 17:42:47 +0000 (10:42 -0700)]
[automerger skipped] resolve merge conflicts of
3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev
am:
fd6df001e0 -s ours
Change-Id: I9d9daffa893d91f9d524c851ba0935f87e085a05
Leo Hsu [Thu, 4 Oct 2018 04:32:35 +0000 (04:32 +0000)]
Merge changes from topics "emergency-dialer-metrics", "telecom-metrics-for-emergency-dialer", "add_faster_emergency_dialer_flag" into pi-dev
* changes:
Add extra data when starting emergency dialer intent
Add new telecom metrics for emergency dialer
Add new metrics constants for emergency dialer
Separated emergency option final UI
Fix Power menu background vanish
Add separated emergency option on power menu
Add emergency dialer option on power menu
Leo Hsu [Tue, 2 Oct 2018 02:18:52 +0000 (10:18 +0800)]
RESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
Removes feature flag and enables faster emergency call features by
default.
Test: Manually
Bug:
112168722
Bug:
117128459
Change-Id: I81e64a229598b8c11a721a0dee7033f6ae3e4fdd
TreeHugger Robot [Thu, 4 Oct 2018 00:51:46 +0000 (00:51 +0000)]
Merge "docs: bug
37126744, typos" into pi-dev
Wayne Lin [Mon, 1 Oct 2018 08:59:49 +0000 (16:59 +0800)]
resolve merge conflicts of
3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev
Bug:
115331218
Bug:
112159033
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
TreeHugger Robot [Wed, 3 Oct 2018 23:34:29 +0000 (23:34 +0000)]
Merge "docs: fixing several typos, bug
36941887" into pi-dev
kopriva [Wed, 3 Oct 2018 23:09:03 +0000 (16:09 -0700)]
docs: bug
37126744, typos
fixing order of import statements to clear repo hooks
Test: make ds-docs
Bug:
37126744
Change-Id: I0ebb3d1d2599a411afd9b8ffd6f2497d821deb2b
Exempt-From-Owner-Approval: Docs-only change
kopriva [Wed, 3 Oct 2018 21:10:27 +0000 (14:10 -0700)]
docs: bug
37077993, object instead of array
also fixing import order to get past repo hooks
Test: make ds-docs
Bug:
37077993
Change-Id: I0a0d6338f714108eb632caacc6dda4b422dc697b
Exempt-From-Owner-Approval: Docs-only change
kopriva [Wed, 3 Oct 2018 20:29:15 +0000 (13:29 -0700)]
docs: fixing several typos, bug
36941887
Test: make ds-docs
Bug:
36941887
Change-Id: Id65c5a6b1cbb214ea46b13a6a68d667c819a2f60
Exempt-From-Owner-Approval: Docs-only change
Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]
Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.
This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths. Consider this example:
<path-permission android:pathPrefix="/private" ... />
uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);
content://com.example//private
The Uri above will pass the security check, since it's not
technically a prefix match. But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.
Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.
Bug:
112555574
Test: atest android.appsecurity.cts.AppSecurityTests
Test: atest FrameworksCoreTests:android.content.ContentProviderTest
Merged-In: Ibadbfa4fc904ec54780c8102958735b03293fb9a
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
Phil Weaver [Wed, 3 Oct 2018 18:23:47 +0000 (18:23 +0000)]
Merge "Fix a11y cache correctness bug" into pi-dev
TreeHugger Robot [Wed, 3 Oct 2018 16:16:50 +0000 (16:16 +0000)]
Merge "Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled on a device" into pi-dev
Julia Reynolds [Wed, 3 Oct 2018 13:35:49 +0000 (13:35 +0000)]
Merge "DO NOT MERGE Fix behavior of getNotificationChannelGroups" into pi-dev
Shaotang Li [Thu, 2 Aug 2018 03:18:00 +0000 (11:18 +0800)]
Add new metrics in power menu
These include,
1. An event indicating that power menu is shown.
2. An event indicating that user taps the emergency dialer icon.
Bug:
112168722
Bug:
111378820
Test: manual and check the result of
'adb logcat -b events | grep sysui_multi_action'
Change-Id: I958ed1af65f559e4999517031cd80fbb1c417108
Merged-In: I958ed1af65f559e4999517031cd80fbb1c417108
yuanjiahsu [Thu, 6 Sep 2018 11:23:52 +0000 (19:23 +0800)]
Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.
Test: Manually
Bug:
112168722
Bug:
113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
Merged-In: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
TreeHugger Robot [Wed, 3 Oct 2018 03:06:16 +0000 (03:06 +0000)]
Merge "docs: bug
117112746, broken link" into pi-dev
Shaotang Li [Wed, 4 Jul 2018 06:18:40 +0000 (14:18 +0800)]
Add extra data when starting emergency dialer intent
This data is used for emergency dialer metrics to determine where user
enters emergency dialer.
Bug:
112168722
Bug:
111378820
Test: manual
Change-Id: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
Merged-In: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
Shaotang Li [Thu, 19 Jul 2018 09:29:39 +0000 (17:29 +0800)]
Add new telecom metrics for emergency dialer
These includes,
1. The source where user initiated the call.
2. The duration between START_CONNECTION and REQUEST_DISCONNECT.
Bug:
112168722
Bug:
111818008
Test: manual and check the result of
'adb shell dumpsys telecom' for metrics data
Change-Id: Iddc7f256362abe9fe252bd12cead05a7d77d329e
Merged-In: Iddc7f256362abe9fe252bd12cead05a7d77d329e
Shaotang Li [Wed, 4 Jul 2018 06:03:25 +0000 (14:03 +0800)]
Add new metrics constants for emergency dialer
Bug:
112168722
Bug:
111378820
Test: build
Change-Id: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Wesley.CW Wang [Fri, 6 Jul 2018 07:26:21 +0000 (15:26 +0800)]
Separated emergency option final UI
- Refine faster emergency icon.
- Add ic_faster_emergency.xml to framework/core/res/drawable.
- Remove faster_emergency_icon.xml from SystemUI/res/drawable.
- Change emergency_icon.xml color to colorError.
- Emergency option(India case) will follow separated option design if
separated option feature is enabled.
Test: Manually,
use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show separated emergency option(default case),
use "adb shell settings put global emergency_affordance_needed 1" to show India emergency option(India case),
India emergency option will be separated button if feature is enabled,
otherwise it will be default design.
Change wallpaper to enable light/dark theme & check separated emergency option color.
(light theme color : D93025 dark theme color : E25142)
Bug:
112168722
Bug:
110658988
Change-Id: I2a3c5ce053aab05381806eedf108cec54af808b1
Merged-In: Id13bcb5b5242ded92b309667c5e2beb8694b9977
Merged-In: I2a3c5ce053aab05381806eedf108cec54af808b1
Wesley.CW Wang [Wed, 4 Jul 2018 09:35:00 +0000 (17:35 +0800)]
Fix Power menu background vanish
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
- Let separated button use mSeparatedViewBackground & origin button use
mListBackground to fix this bug.
- Rename View mChild to mList.
Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.
Bug:
112168722
Bug:
111101759
Change-Id: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
Merged-In: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Wesley.CW Wang [Fri, 15 Jun 2018 08:24:57 +0000 (16:24 +0800)]
Add separated emergency option on power menu
- Add a separated button on power menu to launch emergency dialer.
- Change HardwareUiLayout.java FrameLayout to LinearLayout, let it can
display separated button.
- Add a flag to recognize separated button should show/hide, if
EmergencyAffordance(India) enabled, separated button will hide,
otherwise power menu will display separated button & power
menu last item won't get white background.
Test: Manually, use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show/hide separated emergency option, press emergency option will go to emergency dialer.
Change-Id: I1140fa412b655c16f3052cbabd118df278fd7f23
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: I1140fa412b655c16f3052cbabd118df278fd7f23
Bug:
112168722
Bug:
80376488
Wesley.CW Wang [Mon, 28 May 2018 08:39:27 +0000 (16:39 +0800)]
Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.
Test: Manually
Bug:
112168722
Bug:
80376488
Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: If359662a4d60dbe0ded89c3afe35db91dca4c445
TreeHugger Robot [Wed, 3 Oct 2018 02:38:13 +0000 (02:38 +0000)]
Merge "docs: bug
37070633, wrong method name" into pi-dev
xshu [Tue, 18 Sep 2018 00:30:15 +0000 (17:30 -0700)]
proto change for wifi link layer usage stats
Adds a new proto field.
Bug:
77603419
Test: compile, unit test
Change-Id: I540e0eda718b6ef586837855e8d650f373f986f2
Merged-In: I540e0eda718b6ef586837855e8d650f373f986f2
(cherry picked from commit
0e0dea406e2a3b256fdb258df75b38c905144534)
kopriva [Tue, 2 Oct 2018 23:47:42 +0000 (16:47 -0700)]
docs: bug
117112746, broken link
Test: make ds-docs
Bug:
117112746
Change-Id: I7f0f99073edc13a0126fd6002eb254f8583d2655
Christopher Tate [Mon, 17 Sep 2018 21:49:07 +0000 (14:49 -0700)]
Fix widget manager / alarm manager deadlock
Don't hold locks while manipulating alarms within the app widget
server, because the joint dependencies on activity manager locking
cause problems.
Change-Id: Ic7a09e6938277df7201be515f9785f326552f166
Bug:
115894687
Test: manual (repeated rebooting including with alarms forced)
(cherry picked from commit
fb2f70a6edd8383ed513addb82ed5d91572ee261)
kopriva [Tue, 2 Oct 2018 23:02:39 +0000 (16:02 -0700)]
docs: bug
37070633, wrong method name
Test: make ds-docs
Bug:
37070633
Change-Id: I0e95ce9ac14f00395ddcd0c74bf450ff77178255
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 2 Oct 2018 21:17:21 +0000 (21:17 +0000)]
Merge "docs: fixing a couple of typos" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 21:13:28 +0000 (21:13 +0000)]
Merge "docs: fixing typo, bug
37006473" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
kopriva [Tue, 2 Oct 2018 19:46:55 +0000 (12:46 -0700)]
docs: fixing typo, bug
37006473
also fixing an import statement that was blocking upload at repo hooks:
removed unused SystemApi import
Test: make ds-docs
Bug:
37006473
Change-Id: I2dec10fad213c4822631ad0f9c518a89d6c0c384
Exempt-From-Owner-Approval: Docs-only change
Todd Kopriva [Tue, 2 Oct 2018 19:03:29 +0000 (19:03 +0000)]
Merge "docs: bug
37130805, typo" into pi-dev
Stanley Tng [Mon, 1 Oct 2018 05:43:06 +0000 (22:43 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Bug:
116317072
Bug:
117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
(cherry picked from commit
3d8dd1ae2c5b7aad91594062e53ef3bc2db7212e)
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
Rafal Slawik [Thu, 13 Sep 2018 10:34:24 +0000 (11:34 +0100)]
Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled on a device
Bug:
115601684
Change-Id: I91c1d4422e0492f19bd1e0fc821b597bd4ff1a7c
Merged-In: I91c1d4422e0492f19bd1e0fc821b597bd4ff1a7c
Fix:
115601684
Test: existing tests pass
(cherry picked from commit
ba9440782c8e8dd4700c8b21af13763e4e95c2d8)
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
kopriva [Mon, 1 Oct 2018 22:54:49 +0000 (15:54 -0700)]
docs: fixing a couple of typos
Test: make ds-docs
Bug:
37130920
Change-Id: Ic3d861624be12fd7967080a09a3f82d941d7e915
Exempt-From-Owner-Approval: Docs-only change
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
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
kopriva [Sat, 29 Sep 2018 19:32:37 +0000 (12:32 -0700)]
docs: bug
37130805, typo
I fixed an extra 'and' while I was at it.
Test: make ds-docs
Bug:
37130805
Change-Id: Ia1e9a991f824253feca628022414f2e1fbdcfea8
Exempt-From-Owner-Approval: Docs-only change