Commit Graph

369557 Commits

Author SHA1 Message Date
Bill Yi
bcd9c90a5b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I26eb9affa49e0ec4a33d8af15636133eb55c926a
2018-10-15 22:12:33 -07:00
Jeff Sharkey
58d1ac473e [automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b
am: 7656e1177f  -s ours

Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
2018-10-11 22:20:54 -07:00
Jeff Sharkey
f85bd2b22d [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
2018-10-11 22:19:39 -07:00
Jeff Sharkey
7656e1177f Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c
am: 893598cd4b

Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
2018-10-11 22:14:40 -07:00
Jeff Sharkey
cef9bae62d [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8
am: 80c65f6ce7

Change-Id: I824cd0b4b0bdb66f9762fb9123f639fe3548f164
2018-10-11 22:09:55 -07:00
Jeff Sharkey
893598cd4b Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am: ab80221a8c

Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
2018-10-11 21:56:21 -07:00
Jeff Sharkey
80c65f6ce7 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac
am: af72f01db8

Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
2018-10-11 21:51:36 -07:00
Jeff Sharkey
ab80221a8c Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev 2018-10-12 04:31:20 +00:00
TreeHugger Robot
7402d7611c Merge "Recover shady content:// paths." into pi-dev 2018-10-12 03:59:38 +00:00
TreeHugger Robot
2667c1dfa2 Merge "Do not start VrManagerService if VR is not supported" into pi-dev 2018-10-11 03:18:04 +00:00
TreeHugger Robot
6d61113df4 Merge changes If834d0f0,I05ec75c7 into pi-dev
* changes:
  Add null check for vrManager
  Add null check for vrManager
2018-10-11 03:17:18 +00:00
TreeHugger Robot
dd7047b4e8 Merge "Add null check for vrManager" into pi-dev 2018-10-11 03:17:12 +00:00
Oscar Shu
be13cfb37e Merge "proto change for wifi link layer usage stats" into pi-dev 2018-10-10 19:42:55 +00:00
kopriva
219f7dcb66 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
2018-10-09 16:01:04 -07:00
TreeHugger Robot
8c7d2142f6 Merge "docs: fixing errors found with lint check" into pi-dev 2018-10-09 20:04:29 +00:00
kopriva
a1a7848f83 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
2018-10-09 10:27:35 -07:00
TreeHugger Robot
415e35525f Merge "docs: bug 37128155, broken link" into pi-dev 2018-10-09 05:47:20 +00:00
Mike Ma
9457e1c429 Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev 2018-10-09 05:45:17 +00:00
TreeHugger Robot
14aa42cfda Merge "docs: fixing 'mange' instead of 'manage'" into pi-dev 2018-10-09 01:33:26 +00:00
TreeHugger Robot
2f38a21898 Merge "docs: bug 37007350, missing word" into pi-dev 2018-10-09 01:31:08 +00:00
TreeHugger Robot
77d59a2f6f Merge "Fix widget manager / alarm manager deadlock" into pi-dev 2018-10-09 00:03:21 +00:00
kopriva
82c591b78b docs: fixing 'mange' instead of 'manage'
Test: make ds-docs

Bug: 117449040

Change-Id: I282a2e960bbf722bf3a72dd932e3bf685abb74e5
Exempt-From-Owner-Approval: Docs-only change
2018-10-08 15:57:00 -07:00
kopriva
d104c81916 docs: bug 37007350, missing word
Test: make ds-docs

Bug: 37007350

Change-Id: Ibbff4232f67e7c955b182ff9f3b97250bb15c310
Exempt-From-Owner-Approval: Docs-only change
2018-10-08 15:24:21 -07:00
Kevin Hufnagle
568b5df03c Merge "docs: Added callouts related to obsolete contacts data fields." into pi-dev 2018-10-08 20:20:18 +00:00
Kevin Hufnagle
18b799e475 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
2018-10-08 09:40:51 -07:00
Mike Ma
757fef799d 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
2018-10-08 16:32:50 +00:00
Jeff Sharkey
a1ec7b115c 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
2018-10-05 20:39:03 +00:00
Leo Hsu
77c2e6736a 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.
2018-10-05 01:06:42 +00:00
Android Build Merger (Role)
af72f01db8 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac
Change-Id: I72c58f65bd2709e23d7631d2e0acc06b40a917f9
2018-10-05 00:19:44 +00:00
Android Build Merger (Role)
50e06f25ac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665
Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937
2018-10-05 00:19:37 +00:00
Android Build Merger (Role)
ae30765665 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac
Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d
2018-10-05 00:19:27 +00:00
Android Build Merger (Role)
6ef77aedac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c
Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a
2018-10-05 00:19:19 +00:00
Android Build Merger (Role)
010585fe3c [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd
Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c
2018-10-05 00:19:12 +00:00
Jeff Sharkey
301d17e4dd 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
2018-10-05 00:19:08 +00:00
kopriva
ee2eda11e6 docs: bug 37128155, broken link
Test: make ds-docs

Bug: 37128155

Change-Id: I39e432b6000b9c32ef62bc10f2d8ad343b9305f9
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:47:12 -07:00
kopriva
cce5e4f4a2 docs: bug 37127405, typo
Test: make ds-docs

Bug: 37127405

Change-Id: I40892ad7248d95a562d6af448ce4d475c79fd19f
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:09:04 -07:00
Andrew Solovay
a3e34fe9fe Merge "docs: Replacing {#link with {@link" into pi-dev 2018-10-04 20:06:59 +00:00
Andrew Solovay
a44f2c075b 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
2018-10-04 18:20:51 +00:00
Wayne Lin
e193c54d84 [automerger skipped] resolve merge conflicts of 3afd4aed42 to oc-dr1-dev am: fd6df001e0 -s ours
am: 95fe3f8cba  -s ours

Change-Id: Ic6b0f8a9d64a9c19ff000ef76f2702327dfa9c64
2018-10-04 11:09:05 -07:00
Wayne Lin
95fe3f8cba [automerger skipped] resolve merge conflicts of 3afd4aed42 to oc-dr1-dev
am: fd6df001e0  -s ours

Change-Id: I9d9daffa893d91f9d524c851ba0935f87e085a05
2018-10-04 10:42:47 -07:00
Leo Hsu
42bae1bf5d 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
2018-10-04 04:32:35 +00:00
Leo Hsu
82e5908df0 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
2018-10-04 01:02:12 +00:00
TreeHugger Robot
58c7bcf12e Merge "docs: bug 37126744, typos" into pi-dev 2018-10-04 00:51:46 +00:00
Wayne Lin
fd6df001e0 resolve merge conflicts of 3afd4aed42 to oc-dr1-dev
Bug: 115331218
Bug: 112159033
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
2018-10-03 23:53:46 +00:00
TreeHugger Robot
7640a41654 Merge "docs: fixing several typos, bug 36941887" into pi-dev 2018-10-03 23:34:29 +00:00
kopriva
762a08fe90 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
2018-10-03 16:13:19 -07:00
kopriva
2cb96ab8a1 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
2018-10-03 14:14:13 -07:00
kopriva
c5fea19846 docs: fixing several typos, bug 36941887
Test: make ds-docs

Bug: 36941887

Change-Id: Id65c5a6b1cbb214ea46b13a6a68d667c819a2f60
Exempt-From-Owner-Approval: Docs-only change
2018-10-03 13:29:15 -07:00
Jeff Sharkey
c084ddbf82 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
2018-10-03 14:26:17 -06:00
Phil Weaver
3fbe56647c Merge "Fix a11y cache correctness bug" into pi-dev 2018-10-03 18:23:47 +00:00