OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Device show "No SIM card" and then showing carrier name during boot" into...
Bill Lin [Wed, 24 Oct 2018 09:35:33 +0000 (09:35 +0000)]
Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev

5 years ago[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant...
Steve Elliott [Tue, 23 Oct 2018 18:06:30 +0000 (11:06 -0700)]
[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname
am: d5bed0f4b6  -s ours

Change-Id: Ic2a4a2d452d55ec87f678c7c4573b819aa145ebf

5 years agoMerge "AudioService: Add Hearing Aid Switch Control" into pi-dev
TreeHugger Robot [Tue, 23 Oct 2018 09:04:49 +0000 (09:04 +0000)]
Merge "AudioService: Add Hearing Aid Switch Control" into pi-dev

5 years agoMerge "Add configurable default setting for assistant componentname" into pi-dev
Daniel Sandler [Mon, 22 Oct 2018 13:42:07 +0000 (13:42 +0000)]
Merge "Add configurable default setting for assistant componentname" into pi-dev

5 years agoAdd configurable default setting for assistant componentname
Dan Sandler [Fri, 19 Oct 2018 22:12:40 +0000 (18:12 -0400)]
Add configurable default setting for assistant componentname

By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

(Note: this is a fix to Change-Id: Ib32daf that clarifies
the logic if R.string.config_defaultAssistantComponentName
has not been set in a given build.)

Test: manual
Bug: 111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067

5 years agoMerge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev
Jayachandran Chinnakkannu [Fri, 19 Oct 2018 20:32:41 +0000 (20:32 +0000)]
Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev

5 years agoDO NOT MERGE: Add configurable default setting for assistant componentname
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname

By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48

5 years agoAdd a new intent ACTION_MMSSMS_DATABASE_LOST
Jayachandran C [Thu, 18 Oct 2018 17:14:12 +0000 (10:14 -0700)]
Add a new intent ACTION_MMSSMS_DATABASE_LOST

This intent is to catch the mmssms.db getting mysteriously lost.
The is a hide@ API and is protected with MODIFY_PHONE_STATE permission.

Bug: 115990430
Test: Simulated mmsmsm.db corruption and verified that the intent is
broadcasted and received by application with MODIFY_PHONE_STATE
permission

Merged-in: I3474df294c550b503b74bde25f10ae43ab5863a1
Change-Id: I3474df294c550b503b74bde25f10ae43ab5863a1

5 years agoMerge changes from topic "malloc-purge" into pi-dev
Tim Murray [Fri, 19 Oct 2018 15:07:14 +0000 (15:07 +0000)]
Merge changes from topic "malloc-purge" into pi-dev

* changes:
  wm: recycle bitmaps immediately in TaskSnapshotPersister
  hwui: purge malloc pages on bitmap destruction

5 years agoMerge "Delay global alerts by 1s for high thresholds" into pi-dev
TreeHugger Robot [Fri, 19 Oct 2018 09:43:39 +0000 (09:43 +0000)]
Merge "Delay global alerts by 1s for high thresholds" into pi-dev

5 years agowm: recycle bitmaps immediately in TaskSnapshotPersister
Tim Murray [Mon, 15 Oct 2018 23:50:23 +0000 (16:50 -0700)]
wm: recycle bitmaps immediately in TaskSnapshotPersister

Bitmap created in TaskSnapshotPersister are very short lived and
shouldn't be left around in the Java heap.

Test: boot, switch apps, works
bug 117795621

Merged-in: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8

5 years agohwui: purge malloc pages on bitmap destruction
Tim Murray [Mon, 15 Oct 2018 23:29:15 +0000 (16:29 -0700)]
hwui: purge malloc pages on bitmap destruction

Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.

Test: boots and works
bug 117795621

Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1

5 years agoAudioService: Add Hearing Aid Switch Control
weichinweng [Tue, 9 Oct 2018 10:02:17 +0000 (18:02 +0800)]
AudioService: Add Hearing Aid Switch Control

1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.

Bug: 112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
Merged-In: I73f1236d44213c6cf4a2708f3c96144416cfa67d

5 years agoMerge "Checks keyguard earlier when blocking notifications." into pi-dev
TreeHugger Robot [Wed, 17 Oct 2018 21:43:49 +0000 (21:43 +0000)]
Merge "Checks keyguard earlier when blocking notifications." into pi-dev

5 years agoMerge "DO NOT MERGE: Add configurable default setting for assistant componentname...
TreeHugger Robot [Wed, 17 Oct 2018 20:24:43 +0000 (20:24 +0000)]
Merge "DO NOT MERGE: Add configurable default setting for assistant componentname" into pi-dev

5 years agoDevice show "No SIM card" and then showing carrier name during boot
Bill Lin [Thu, 5 Jul 2018 09:48:49 +0000 (17:48 +0800)]
Device show "No SIM card" and then showing carrier name during boot

Keyguard default show NO SIM earlier than Telephony/Subscription callback
Refactor CarrierText & KeyguardUpdateMonitor
 - Replace setup flag by resource attr(showMissingSim/showAirplaneMode)
 - Remove setDiplayFlags API, and add mTelephonyCapable flag
 - Implement MSG_TELEPHONY_CAPABLE in KeyguardUpdateMonitor
 - Default do not show AirplaneMode & NO_SIM label unless define in xml

Bug: 111732320
Test: atest SystemUITests
      atest frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
      Manual:
         1) Insert SIM and reboot device, only show "No Service"->"Operator"
 2) Remove SIM and reboot device, only show "No SIM"
 3) Enable AirplaneMode reboot, only show "Airplane mode"
 4) Insert SIM and trigger sysui crash, state same as 1)
 5) Remove SIM and trigger sysui crash, state same as 2)
 6) Enable APM trigger sysui crash, state same as 3)
 7) Enable APM & WFC, turn on wifi in keyguard showing
    -> "Airplane mode" -> "" -> "WiFi Calling"
 8) Enable APM & WFC, turn off wifi in keyguard showing
    -> "Wifi Calling" -> "Airplane mode"

Change-Id: I4459997420484431751a4c088aa3856724affe6a
Merged-In: I4459997420484431751a4c088aa3856724affe6a

5 years agoDO NOT MERGE: Add configurable default setting for assistant componentname
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname

By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067

5 years agoChecks keyguard earlier when blocking notifications.
Gus Prevas [Mon, 24 Sep 2018 21:15:32 +0000 (17:15 -0400)]
Checks keyguard earlier when blocking notifications.

This change modifies NotificationInfo to call the provided keyguard
callback when the "Stop notifications" button is tapped, rather than
when trying to save the new importance value after the undo timeout.

Test: updated test cases in NotificationInfoTest.
Bug: 111416533
Change-Id: I89b4715d0d41be4587753f554862e51c4e1d43c3
Merged-In: I89b4715d0d41be4587753f554862e51c4e1d43c3
(cherry picked from commit 533836ac7265b4f731f25fcc849378e9976a9fd5)

5 years agoMerge "DO NOT MERGE Fixes clipping on PagedTileLayout" into pi-dev
Fabian Kozynski [Wed, 17 Oct 2018 13:21:15 +0000 (13:21 +0000)]
Merge "DO NOT MERGE Fixes clipping on PagedTileLayout" into pi-dev

5 years agoMerge "audio: apply volume upon hearing aid device connection" into pi-dev
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

5 years agoMerge "Import translations. DO NOT MERGE" 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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoMerge "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

5 years agoDelay global alerts by 1s for high thresholds
Chalard Jean [Wed, 22 Aug 2018 01:21:26 +0000 (10:21 +0900)]
Delay global alerts by 1s for high thresholds

This is a cherry-pick of aosp/735725 with a minor conflict.

By skipping updates if an alert is already scheduled, this avoids firing
the global alert too often on devices with high transfer speeds and high
quota.

Test: with tethering watching videos. Also runtest frameworks-net
Bug: 117243748
Change-Id: Ia0ed76141dfb33546529786eb0118138ef3708c2
Merged-In: Ie0ba5c1d1a2139606e63fcfe46ec77a89accd8d9
Merged-In: Iaabb31586e9e747871a526dc7ebb7deeb65d8f83

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoRequest lmkd to purge its list of pids after establishing connection
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>
5 years ago[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths."...
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

5 years ago[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths...
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

5 years agoMerge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years agoMerge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years agoMerge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev

5 years agoMerge "Recover shady content:// paths." into pi-dev
TreeHugger Robot [Fri, 12 Oct 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Recover shady content:// paths." into pi-dev

5 years agoDO NOT MERGE Fixes clipping on PagedTileLayout
Fabian Kozynski [Wed, 10 Oct 2018 16:52:35 +0000 (12:52 -0400)]
DO NOT MERGE Fixes clipping on PagedTileLayout

Manually cherry-picked from ag/5161962 and ag/5213435

Defines left and right bounds for clipping the pages of PagedTileLayout
with the same width as the padding in PagedTileLayout.TilePage.

Test: manual && atest
Change-Id: I5023d5a20749ad239036c316e035e31bed013cff
Fixes: 117096186

5 years agoMerge "Do not start VrManagerService if VR is not supported" 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

5 years agoMerge changes If834d0f0,I05ec75c7 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

5 years agoMerge "Add null check for vrManager" into pi-dev
TreeHugger Robot [Thu, 11 Oct 2018 03:17:12 +0000 (03:17 +0000)]
Merge "Add null check for vrManager" into pi-dev

5 years agoMerge "proto change for wifi link layer usage stats" 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

5 years agoaudio: apply volume upon hearing aid device connection
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

5 years agodocs: fixing errors found with lint checker
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

5 years agoMerge "docs: fixing errors found with lint check" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 20:04:29 +0000 (20:04 +0000)]
Merge "docs: fixing errors found with lint check" into pi-dev

5 years agodocs: fixing errors found with lint check
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

5 years agoMerge "docs: bug 37128155, broken link" into pi-dev
TreeHugger Robot [Tue, 9 Oct 2018 05:47:20 +0000 (05:47 +0000)]
Merge "docs: bug 37128155, broken link" into pi-dev

5 years agoMerge "DO NOT MERGE: Fix signature of KernelCpuProcReader" 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

5 years agoMerge "docs: fixing 'mange' instead of 'manage'" 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

5 years agoMerge "docs: bug 37007350, missing word" 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

5 years agoMerge "Fix widget manager / alarm manager deadlock" 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

5 years agodocs: fixing 'mange' instead of 'manage'
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

5 years agodocs: bug 37007350, missing word
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

5 years agoMerge "docs: Added callouts related to obsolete contacts data fields." into pi-dev
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

5 years agodocs: Added callouts related to obsolete contacts data fields.
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

5 years agoDO NOT MERGE: Fix signature of KernelCpuProcReader
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

5 years agoRESTRICT AUTOMERGE: Recover shady content:// paths.
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

5 years agoMerge changes from topics "remove_feature_flag_emergency", "faster_emergency_feature_...
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.

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd
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

5 years agoRESTRICT AUTOMERGE: Recover shady content:// paths.
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

5 years agodocs: bug 37128155, broken link
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

5 years agodocs: bug 37127405, typo
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

5 years agoMerge "docs: Replacing {#link with {@link" into pi-dev
Andrew Solovay [Thu, 4 Oct 2018 20:06:59 +0000 (20:06 +0000)]
Merge "docs: Replacing {#link with {@link" into pi-dev

5 years agodocs: Replacing {#link with {@link
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

5 years ago[automerger skipped] resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa...
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

5 years ago[automerger skipped] resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa...
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

5 years agoMerge changes from topics "emergency-dialer-metrics", "telecom-metrics-for-emergency...
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

5 years agoRESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
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

5 years agoMerge "docs: bug 37126744, typos" into pi-dev
TreeHugger Robot [Thu, 4 Oct 2018 00:51:46 +0000 (00:51 +0000)]
Merge "docs: bug 37126744, typos" into pi-dev

5 years agoresolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-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

5 years agoMerge "docs: fixing several typos, bug 36941887" into pi-dev
TreeHugger Robot [Wed, 3 Oct 2018 23:34:29 +0000 (23:34 +0000)]
Merge "docs: fixing several typos, bug 36941887" into pi-dev

5 years agodocs: bug 37126744, typos
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

5 years agodocs: bug 37077993, object instead of array
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

5 years agodocs: fixing several typos, bug 36941887
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

5 years agoRecover shady content:// paths.
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

5 years agoMerge "Fix a11y cache correctness bug" into pi-dev
Phil Weaver [Wed, 3 Oct 2018 18:23:47 +0000 (18:23 +0000)]
Merge "Fix a11y cache correctness bug" into pi-dev

5 years agoMerge "Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled...
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

5 years agoMerge "DO NOT MERGE Fix behavior of getNotificationChannelGroups" 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

5 years agoAdd new metrics in power menu
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

5 years agoAdd feature flag in Settings.
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

5 years agoMerge "docs: bug 117112746, broken link" into pi-dev
TreeHugger Robot [Wed, 3 Oct 2018 03:06:16 +0000 (03:06 +0000)]
Merge "docs: bug 117112746, broken link" into pi-dev

5 years agoAdd extra data when starting emergency dialer intent
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

5 years agoAdd new telecom metrics for emergency dialer
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

5 years agoAdd new metrics constants for emergency dialer
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

5 years agoSeparated emergency option final UI
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