Commit Graph

95269 Commits

Author SHA1 Message Date
Shuo Qian
a1c6087157 Merge "Emergency number database config updater" am: ca0f14ec1a
am: 9208fc5a0a

Change-Id: Id32674a1021f1902444b996b0ee5eb4be5fe30a1
2019-10-21 13:38:20 -07:00
Shuo Qian
9208fc5a0a Merge "Emergency number database config updater"
am: ca0f14ec1a

Change-Id: Ice41292677b52fe62fa860960fe62a29e28068dc
2019-10-21 13:22:50 -07:00
Shuo Qian
ca0f14ec1a Merge "Emergency number database config updater" 2019-10-21 19:59:39 +00:00
Neil Fuller
84c6981a8f Merge "Make TimeDetectorService more aware of origin" am: 4ef2551dfa
am: 3150e58082

Change-Id: Ia70f69e226a7800e82e29dd504351aef65048ed3
2019-10-21 12:04:05 -07:00
Neil Fuller
3150e58082 Merge "Make TimeDetectorService more aware of origin"
am: 4ef2551dfa

Change-Id: I27866cf74b779bb0040f4ace384207047ca6838f
2019-10-21 11:53:20 -07:00
Neil Fuller
af3eeaf431 Make TimeDetectorService more aware of origin
Make TimeDetectorService more aware of a time signal's origin by making
the time signal from telephony less generic.

When TimeDetectorService was written it was assumed that the TimeSignal
could be generic and there would just be a String source identifier to
indicate origin.

With multiple SIMs / phones on a device it makes sense to keep track of
the originating phone of the signal so that the time detector service
could implement stickiness if it wanted. This would avoid a device
alternating back and forth between two signals and help with debugging.

As new signals are added, new "suggestXxxxTime()" methods will be added
to TimeDetectorService. That is the point at which the strategy for
ranking different sources can be decided. e.g. should NTP always rank
higher than NITZ?

The main change here is that TimeSignal is renamed to
PhoneTimeSuggestion to indicate it's only for use by signals from
telephony, sourceId has been removed and it has been given a phoneId
instead. Extra free-form metadata (mDebugInfo) has been added to assist
with logging / debugging.

Bug:140712361
Test: atest android.app.timedetector
Test: atest com.android.server.timedetector
Change-Id: I5305c34516e5f4e254309193183f00e054801a46
2019-10-21 08:42:50 +01:00
Jimmy Chen
e21e19ec4d Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb
am: 58d08de0c6

Change-Id: I618c950426976dd1899284d0c249ea7b4e45b479
2019-10-17 23:12:30 -07:00
Jimmy Chen
58d08de0c6 Merge "p2p: mirgrate p2p into tethering modes"
am: 8a9a9adaeb

Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54
2019-10-17 23:06:04 -07:00
Jimmy Chen
8a9a9adaeb Merge "p2p: mirgrate p2p into tethering modes" 2019-10-18 05:42:31 +00:00
Aaron Huang
c55e2d6d59 Merge "Expose MacAddress methods to public API" am: 7b98130570
am: 0688f9b6b1

Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
2019-10-17 21:07:13 -07:00
Aaron Huang
0688f9b6b1 Merge "Expose MacAddress methods to public API"
am: 7b98130570

Change-Id: I98c2104fe5307e916bd2026eb943bfe4a9913d07
2019-10-17 20:55:36 -07:00
Aaron Huang
7b98130570 Merge "Expose MacAddress methods to public API" 2019-10-18 03:45:40 +00:00
Shuo Qian
2f349da995 Emergency number database config updater
Test: https://paste.googleplex.com/5345498821033984
Bug: 136027884
Change-Id: I0fbd48fe8ef5e008af714312859b513a22679fcb
Merged-In: I0fbd48fe8ef5e008af714312859b513a22679fcb
(cherry picked from commit 8163b80a7e)
2019-10-17 23:42:06 +00:00
Aaron Huang
f857470625 Expose MacAddress methods to public API
To support mainline modules, adding the methods which
are used by wifi.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I49856863c15b6b3b59aa867a77b0f137003149ef
2019-10-15 17:33:05 +08:00
TreeHugger Robot
ee4eb8c39d Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 2019-10-15 00:24:25 +00:00
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
2019-10-14 22:54:53 +00:00
Treehugger Robot
2f1d3ac4f4 Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." 2019-10-14 21:44:51 +00:00
Philip P. Moltmann
b8b4015e2b Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." into stage-aosp-master 2019-10-14 20:47:48 +00:00
Neil Fuller
4055cdd965 Merge "Make TimestampedValue Parcelable" am: 81a705690b
am: 209c74f8b6

Change-Id: I4d9afe91fdea9c5819e4d3d744ac784304abcd19
2019-10-14 11:49:47 -07:00
Neil Fuller
209c74f8b6 Merge "Make TimestampedValue Parcelable"
am: 81a705690b

Change-Id: I68edcf15ec9bef69a26267d9bf0c036e38ce93d4
2019-10-14 11:43:18 -07:00
Treehugger Robot
81a705690b Merge "Make TimestampedValue Parcelable" 2019-10-14 18:33:43 +00:00
Svet Ganov
484271bc7e [DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution.
We had accidental usages of the PermissionChecker for cases where no
private data was provided to the app but the checkPermission API on
the latter also did blame data access on the app. The PermissionChecker
was designed to handle IPC calls and not for generic API checks.

To avoid future accidental incorrect PermissionChecker usages this
change renames the existing APIs of the latter to clearly indicate
that they should be used for data delivery and also adds sibling
methods for doing the same permission checks for preflight purposes.
Also the documentation is improved to furhter assist developers.

In addition, this change fixes accidental permission checker usages
that blame when they should not by using the new preflight flavor
of the permission check APIs.

Test:
    atest com.android.settingslib.location.RecentLocationAppsTest
    atest CtsPermissionTestCases
    added: LocationAccessCheckTest#notificationOnlyForAccessesSinceFeatureWasEnabled
    added: LocationAccessCheckTest#noNotificationIfFeatureDisabled
    added: LocationAccessCheckTest#noNotificationIfBlamerNotSystemOrLocationProvider
    added: LocationAccessCheckTest#testOpeningLocationSettingsDoesNotTriggerAccess

Bug:141028068
Change-Id: I89f4add79a55c3c8d6fbe8d57decaa78fe12f0f9
Merged-In: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
2019-10-14 17:22:30 +00:00
Svet Ganov
534b728a1e [DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution.
We had accidental usages of the PermissionChecker for cases where no
private data was provided to the app but the checkPermission API on
the latter also did blame data access on the app. The PermissionChecker
was designed to handle IPC calls and not for generic API checks.

To avoid future accidental incorrect PermissionChecker usages this
change renames the existing APIs of the latter to clearly indicate
that they should be used for data delivery and also adds sibling
methods for doing the same permission checks for preflight purposes.
Also the documentation is improved to furhter assist developers.

In addition, this change fixes accidental permission checker usages
that blame when they should not by using the new preflight flavor
of the permission check APIs.

Test:
    atest com.android.settingslib.location.RecentLocationAppsTest
    atest CtsPermissionTestCases
    added: LocationAccessCheckTest#notificationOnlyForAccessesSinceFeatureWasEnabled
    added: LocationAccessCheckTest#noNotificationIfFeatureDisabled
    added: LocationAccessCheckTest#noNotificationIfBlamerNotSystemOrLocationProvider
    added: LocationAccessCheckTest#testOpeningLocationSettingsDoesNotTriggerAccess

Bug:141028068
Change-Id: I4a74d4906f92e323fbd30b9b25011129895afc9a
Merged-In: I89f4add79a55c3c8d6fbe8d57decaa78fe12f0f9
Merged-In: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
2019-10-14 17:15:38 +00:00
Jon Spivack
6b8cef41e5 Merge "Made libbinder's waitForService accessible in java" am: 3ef1b5e544
am: fa830219cd

Change-Id: I312f51b6a802754981bf642c587cbbdb3024cfbb
2019-10-11 18:17:45 -07:00
Jon Spivack
fa830219cd Merge "Made libbinder's waitForService accessible in java"
am: 3ef1b5e544

Change-Id: I70972120fcb7dd7cbe664750409bfd00a41e0a62
2019-10-11 18:06:40 -07:00
Jon Spivack
3ef1b5e544 Merge "Made libbinder's waitForService accessible in java" 2019-10-12 00:50:43 +00:00
Jon Spivack
9e45fde5e9 Made libbinder's waitForService accessible in java
waitForService is used to lazily start AIDL services

Bug: 138756857
Test: Manual (tested starting gsiservice with this function)
Change-Id: I7ff16b014052d3845bd4b1baa8fc9843e7975a16
2019-10-11 15:15:02 -07:00
Tobias Sargeant
dd702a3a54 Merge "[webview] Fix handling of unicode digits in address detection." am: 8abff6b4d0
am: e71eaf3f5e

Change-Id: I4d972bdbd6709bc414a4220aa700e3bab97536b9
2019-10-11 04:09:20 -07:00
Tobias Sargeant
e71eaf3f5e Merge "[webview] Fix handling of unicode digits in address detection."
am: 8abff6b4d0

Change-Id: I08b798ac8867c14098a48dd2782ceab794360683
2019-10-11 03:57:24 -07:00
Treehugger Robot
8abff6b4d0 Merge "[webview] Fix handling of unicode digits in address detection." 2019-10-11 10:30:36 +00:00
Ember Rose
159091ed3f Merge "Update Ember's email" am: 0e6683ef7e
am: bf7239e2fb

Change-Id: I394749d83ceac0e1373aa83f5f85ccf9cb29483b
2019-10-10 21:46:22 -07:00
Ember Rose
bf7239e2fb Merge "Update Ember's email"
am: 0e6683ef7e

Change-Id: Id3238ab619c35cea877ad50fba5a0e6729e10346
2019-10-10 21:32:39 -07:00
Ember Rose
0e6683ef7e Merge "Update Ember's email" 2019-10-11 04:07:46 +00:00
Xin Li
019d9d0bf7 Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" 2019-10-11 02:56:40 +00:00
Ember Rose
4e76b6acd6 Update Ember's email
Test: N/A
Fix: 141939605
Change-Id: Icd9ae23a74175a98f8495f71c85b69891d387df0
Merged-In: Icd9ae23a74175a98f8495f71c85b69891d387df0
2019-10-10 22:41:57 +00:00
Neil Fuller
def77b5cd5 Make TimestampedValue Parcelable
Make TimestampedValue Parcelable for simplicity.

TimetampedValue objects are not generally parcelable, depending on the
type of the value held. Previously, TimestampedValue did not implement
Parcelable to avoid committing to a general contract. Developers
parceling TimestampedValue objects were expected to call
TimestampedValue.writeToParcel() / TimestampedValue.readFromParcel()
explicitly when they knew it was safe to do so. This also meant that
TimestampedValues couldn't be used directly via AIDL.

This change makes TimestampedValue parcelable because it's more
familiar / convenient. Attempts to marshall a TimestampedValue that
contains a non-parcelable value will still throw a RuntimeException.

Bug: 140712361
Test: atest android.util.TimestampedValueTest
Change-Id: I8ca9c72f0433b380ce720cd813f650e743b3ddae
2019-10-10 10:16:41 +01:00
Chalard Jean
cbdc9a1e48 Merge "Improve documentation for NetworkCallbacks." am: 90a84e26bd
am: cf03f69025

Change-Id: If8478eea266decd897382fe1e6efffa23f77f7ab
2019-10-09 23:21:02 -07:00
Chalard Jean
cf03f69025 Merge "Improve documentation for NetworkCallbacks."
am: 90a84e26bd

Change-Id: I7384a0224bdf3fe86aee3733d4b7a6e5e12b5a4e
2019-10-09 23:14:30 -07:00
Chalard Jean
90a84e26bd Merge "Improve documentation for NetworkCallbacks." 2019-10-10 05:56:59 +00:00
Xin Li
8efb8c35f1 DO NOT MERGE - Merge QP1A.191005.007 into master
Bug: 142297020
Merged-In: Ifc7254ab3a5272b056cbc75233aa2dfa8219ea84
Change-Id: Ib4566cec52912a8daa86c317fd99d6d60ef1524f
2019-10-10 00:28:04 +00:00
Alex Light
b49226d0be Merge "Perform agent startup-attach before bind" am: 7ae1299cdd
am: d3337c9051

Change-Id: I1a23e449d95ddc61aafcb3746bc79f6b734ddbef
2019-10-09 14:58:09 -07:00
Alex Light
d3337c9051 Merge "Perform agent startup-attach before bind"
am: 7ae1299cdd

Change-Id: I9fc9f0daa019ce8110154d8ede8f269b7d3bfea9
2019-10-09 14:42:15 -07:00
Alex Light
7ae1299cdd Merge "Perform agent startup-attach before bind" 2019-10-09 21:25:48 +00:00
Chalard Jean
599ce75792 Improve documentation for NetworkCallbacks.
Bug: 139570489
Test: m doc-comment-check-docs
Change-Id: I9e13057b7e46908863156986429ff2ce93d4be78
2019-10-09 18:33:09 +09:00
Daniel Colascione
3b2f1e2d4d Merge "Apply JNI optimizations to HwParcel" am: 299036ea2f
am: 2e7651e279

Change-Id: Ib0f2f227a01e9ec43f3b8a96a5330bf7ae76ec44
2019-10-08 17:09:45 -07:00
Daniel Colascione
2e7651e279 Merge "Apply JNI optimizations to HwParcel"
am: 299036ea2f

Change-Id: Icabf83e888a99f8b2837540f5709c7e72a515fa0
2019-10-08 16:55:34 -07:00
Daniel Colascione
c94b8c3dcc Apply JNI optimizations to HwParcel
This change reduces the JNI overhead of binder calls by about 160ns
per parameter.

Test: boots
Change-Id: Ie3acdbf9f3ad48c884042ada5e63bd9757c6b2e6
2019-10-08 14:12:48 -07:00
Kevin Hufnagle
2f57ebf99c Merge "docs: Updated SECURITY_PATCH field description" into qt-dev am: 3c92f24adb
am: 7b02dd8342

Change-Id: I432a4b416077f2ab21f34eec32956278846af809
2019-10-08 12:08:12 -07:00
Kevin Hufnagle
7b02dd8342 Merge "docs: Updated SECURITY_PATCH field description" into qt-dev
am: 3c92f24adb

Change-Id: Ieb7549bb38439ad297bba0f5a4b64870919651a7
2019-10-08 12:00:20 -07:00
Kevin Hufnagle
3c92f24adb Merge "docs: Updated SECURITY_PATCH field description" into qt-dev 2019-10-08 18:36:19 +00:00