Commit Graph

83971 Commits

Author SHA1 Message Date
Andrew Solovay
d10e384d6c resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00: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
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
kopriva
d64ab297d5 Merge "docs: bug 37126744, typos" into pi-dev
am: 58c7bcf12e

Change-Id: I5a7b100cc186e92a16e1572a1cbee3f789e8df58
2018-10-03 18:22:41 -07:00
TreeHugger Robot
58c7bcf12e Merge "docs: bug 37126744, typos" into pi-dev 2018-10-04 00:51:46 +00:00
kopriva
9c736132c2 Merge "docs: fixing several typos, bug 36941887" into pi-dev
am: 7640a41654

Change-Id: I4e95b8e43ce12a428baa41102260d6b145589a34
2018-10-03 16:58:12 -07:00
kopriva
434a0a5370 docs: bug 37077993, object instead of array
am: 2cb96ab8a1

Change-Id: I527d10e66525810bda0083bed92f4b31ae13bcb9
2018-10-03 16:52:26 -07: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
Phil Weaver
79625e978c Merge "Fix a11y cache correctness bug" into pi-dev
am: 3fbe56647c

Change-Id: Ifb19caaf010adfa2d1ca57f767e4be830b09e4bd
2018-10-03 12:09:18 -07:00
Phil Weaver
3fbe56647c Merge "Fix a11y cache correctness bug" into pi-dev 2018-10-03 18:23:47 +00:00
Wesley.CW Wang
36d9d5bc55 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
2018-10-03 02:57:38 +00:00
kopriva
1862847340 Merge "docs: fixing typo, bug 37006473" into pi-dev
am: 323a915bb3

Change-Id: I3544307a34da9fc358ed63316fb3212507bd8ef7
2018-10-02 17:18:00 -07:00
Siarhei Vishniakou
b185c37a36 Merge "Dismiss Dialog in post instead of immediately" am: 9b2c026f10
am: 919e151bd3

Change-Id: Id214aaf4e7c7f58429f13a5c32b80149be401fbe
2018-10-02 16:31:39 -07:00
Siarhei Vishniakou
919e151bd3 Merge "Dismiss Dialog in post instead of immediately"
am: 9b2c026f10

Change-Id: Iceb48f0a6f0172a4de2d3da668a38c7977cf20dd
2018-10-02 15:23:16 -07:00
Treehugger Robot
9b2c026f10 Merge "Dismiss Dialog in post instead of immediately" 2018-10-02 21:34:07 +00:00
kopriva
b0cbd1637b 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
2018-10-02 12:51:17 -07:00
Leif Hendrik Wilden
bf1f2c455e Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7
am: 1bceeaac85

Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f
2018-10-02 11:06:14 -07:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Stanley Tng
a5866c647e 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 fe8c8337ed)

Change-Id: I7d0b6759e7acba3fb2a4d1afdba35d5a95387777
2018-10-01 21:49:13 -07:00
TreeHugger Robot
9c3f60d2f9 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
2018-10-02 00:53:40 +00:00
kopriva
978a89cfcb Merge "docs: bug 72853855, wrong parameter" into pi-dev
am: 1f86e2f4ca

Change-Id: I95b3d8fe6ca585a5dc4168ced763ae1a9a70feb7
2018-10-01 12:03:55 -07:00
kopriva
3bc799f6dc Merge "docs: bug 72929620, nonoteslas typo" into pi-dev
am: 21155ef8bc

Change-Id: I3db7fd7f549e0ca4fba7434cfbb6cb529ab9ca1e
2018-10-01 11:58:15 -07:00
kopriva
bfa9ed00e0 Merge "docs: bug 112769174, unclosed parentheses" into pi-dev
am: 6ee6799c03

Change-Id: I0d2c0adccb751909413f49c87238d12f4355558d
2018-10-01 11:52:43 -07:00
Jeff Sharkey
8fe3754f1a Merge changes from topic "bugfix_content_path" am: aa642187cd
am: f8ad474935

Change-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452
2018-10-01 11:40:25 -07:00
Jeff Sharkey
f8ad474935 Merge changes from topic "bugfix_content_path"
am: aa642187cd

Change-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3
2018-10-01 11:25:38 -07:00
TreeHugger Robot
1f86e2f4ca Merge "docs: bug 72853855, wrong parameter" into pi-dev 2018-10-01 18:18:46 +00:00
TreeHugger Robot
21155ef8bc Merge "docs: bug 72929620, nonoteslas typo" into pi-dev 2018-10-01 18:16:22 +00:00
Jeff Sharkey
aa642187cd Merge changes from topic "bugfix_content_path"
* changes:
  Add OEM_SOUNDS_DIR variable
  Fix the bug that secondary storage path is judged as internal
  Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
2018-10-01 17:49:03 +00:00
Leif Hendrik Wilden
fd30663181 Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Lorenzo Colitti
b0cac388e4 Merge "Make requestRouteToHost a no-op for system callers." am: f1bcfb6014
am: 07012857ae

Change-Id: Iefddec95271b56007794fa10f7f3a4122c68877e
2018-09-30 23:15:42 -07:00
Lorenzo Colitti
07012857ae Merge "Make requestRouteToHost a no-op for system callers."
am: f1bcfb6014

Change-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac
2018-09-30 23:00:08 -07:00
Treehugger Robot
f1bcfb6014 Merge "Make requestRouteToHost a no-op for system callers." 2018-10-01 05:36:28 +00:00
Lorenzo Colitti
2e31a7c004 Make requestRouteToHost a no-op for system callers.
Everything in the system should now be using proper multinetwork
APIs instead of this insecure and error-prone API.

Make this method do nothing when called by the system. For now,
keep the code around for backwards compatibility for apps
targeting Android releases before M.

Bug: 25824776
Bug: 25876485
Test: FrameworksNetTests pass
Test: CtsNetTestCasesLegacyApi22 pass
Test: CtsNetTestCasesLegacyPermission22 pass
Test: android.net.cts.ConnectivityManagerTest passes
Change-Id: I9b3557faccccc95c7b954db6a13b853b4c7edea0
2018-10-01 12:05:42 +09:00
Remi NGUYEN VAN
755c78a8dd Merge changes I0f997d30,I288ba1f4 am: 53f8591789
am: bc3c6b1314

Change-Id: Icb2c5b89895976263cd713651778061d348ba368
2018-09-30 20:00:51 -07:00
Remi NGUYEN VAN
bc3c6b1314 Merge changes I0f997d30,I288ba1f4
am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9
2018-09-30 19:53:29 -07:00
kopriva
fdb0bffb0b docs: bug 112769174, unclosed parentheses
Test: make ds-docs

Bug: 112769174

Change-Id: I3322e06bf3b4624a7ed09dc476bdfe715ea0a27a
Exempt-From-Owner-Approval: Docs-only change
2018-09-29 15:22:41 -07:00
kopriva
b9cf1a1ada docs: bug 72929620, nonoteslas typo
Test: make ds-docs

Bug: 72929620

Change-Id: Ie6e5d3b8c0770ffb4ffb58b3e484e5cf30a9126f
Exempt-From-Owner-Approval: Docs-only change
2018-09-29 14:41:05 -07:00
kopriva
b350c7e53c docs: bug 72853855, wrong parameter
Test: make ds-docs

Bug: 72853855

Change-Id: Id6e64cba2af10488b677daabb5e113f278aa0f95
Exempt-From-Owner-Approval: Docs-only change
2018-09-29 14:22:07 -07:00
Julia Reynolds
efdd7bc91a Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev
am: 1f3c8278e8

Change-Id: I505fb77cea4e861acea138c8661d535b752afae9
2018-09-28 10:00:21 -07:00
TreeHugger Robot
1f3c8278e8 Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev 2018-09-28 16:38:31 +00:00
Remi NGUYEN VAN
e0d8c0e09e Enable new DHCP server by default
Regression tests pass with aosp/764042.

Test: regression automated tests, manual (verified WiFi, bluetooth
      tethering working).
Bug: b/109584964

Change-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78
2018-09-28 12:43:47 +09:00
Amith Yamasani
0631cca3ff Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev
am: 311f0f5da5

Change-Id: I941f1a8f9b6ee2c65ee289a159146d5b2ee95dcc
2018-09-27 18:11:46 -07:00
TreeHugger Robot
311f0f5da5 Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev 2018-09-28 00:50:39 +00:00
kopriva
e052af447d Merge "docs: fix bug 37054309, becuase typo" into pi-dev
am: 9359f3683c

Change-Id: I8ba3e3bd1d6aa296f216343d78cc252385ba64ba
2018-09-27 13:24:29 -07:00
TreeHugger Robot
9359f3683c Merge "docs: fix bug 37054309, becuase typo" into pi-dev 2018-09-27 20:03:29 +00:00