Commit Graph

55915 Commits

Author SHA1 Message Date
Automerger Merge Worker
feb7f9cf81 Merge "Support multiple DSU installations" am: 69d181aecc am: fd9ae75440
Change-Id: I236a00274d6b6e7d1c7ac134ef17232c368cdd6a
2020-01-16 06:14:51 +00:00
Howard Chen
69d181aecc Merge "Support multiple DSU installations" 2020-01-16 05:33:10 +00:00
Automerger Merge Worker
4ce52911a3 Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" am: ca98e2866e am: 2fd4a1c4be
Change-Id: If51dce95c2779790a845c0462655e5f68cf1b1bf
2020-01-16 03:20:42 +00:00
Calin Juravle
ca98e2866e Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" 2020-01-16 03:14:05 +00:00
Dan Zimmerman
39b442cb61 [DexManager] Fix off-by-N error in DexManager when reporting dex loads
In this loop the continue statement skips over incrementing
dexPathIndex. In effect the classloader context that reported for a
given dex file may be incorrect (specifically in the situation when the
user loads a primary dex file and a secondary dex file in the same
ClassLoader)

Bug: 147089377
Test: atest com.android.server.pm.dex.DexManagerTests
Change-Id: I7d3df507787f758537625b702131a2f4f76190e6
2020-01-16 03:13:50 +00:00
Automerger Merge Worker
c5bfdd62c9 Merge "Use non-wakeup alarm for delay constraint." am: 3f9e9efe46 am: 3ade229c1c
Change-Id: I1232500c5f954ce757c1371ef2d9eeedb2987728
2020-01-15 20:29:41 +00:00
Treehugger Robot
3f9e9efe46 Merge "Use non-wakeup alarm for delay constraint." 2020-01-15 20:07:43 +00:00
Automerger Merge Worker
ca946bed5f DO NOT MERGE Fix AppOpsServiceTest am: c03b32c406 am: 47cc84875c
Change-Id: Iccb7dc7d5857c2fbd03372cc0f97cfd429ece85f
2020-01-15 19:15:23 +00:00
Automerger Merge Worker
cb5b958917 Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40
Change-Id: I10447351e53ff84e6b2c747574080741189c6206
2020-01-15 19:14:45 +00:00
Philip P. Moltmann
47cc84875c DO NOT MERGE Fix AppOpsServiceTest
am: c03b32c406

Change-Id: Icb334aaa1f7a6ad6815fb034bbac27f3ace09cdb
2020-01-15 11:08:21 -08:00
Treehugger Robot
e88817bd42 Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1
* changes:
  DO NOT MERGE Fix AppOpsServiceTest
  DO NOT MERGE Don't throw exception in AppOpsManager.checkOp
  DO NOT MERGE Remove unnecessary internal APIs.
  DO NOT MERGE SetMode: Don't call into PM with AppOps lock held
2020-01-15 19:01:15 +00:00
Shuo Qian
725c54065d Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." 2020-01-15 18:51:54 +00:00
Automerger Merge Worker
9cfa347e01 NetworkScoreManager: Expose SCORE_FILTER_* consts am: 16fc91a1c1 am: 51564c0050
Change-Id: I9532ed9e27aa83cc90b2e04fa5c6e330891dbc33
2020-01-15 18:25:42 +00:00
Automerger Merge Worker
b8a357c250 Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
David Su
51564c0050 NetworkScoreManager: Expose SCORE_FILTER_* consts
am: 16fc91a1c1

Change-Id: Ibeb6f983417da745766a50a4b06b846f92721cec
2020-01-15 10:18:07 -08:00
David Su
427cb398e2 Merge changes from topic "networkscoremanager-cachefilter"
* changes:
  SettingsLib: Rename CACHE_FILTER_* to SCORE_FILTER_*
  NetworkScoreManager: Expose SCORE_FILTER_* consts
2020-01-15 17:55:35 +00:00
Rambo Wang
7fd95f64df Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" 2020-01-15 17:45:58 +00:00
Automerger Merge Worker
a166b4c136 Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb
Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890
2020-01-15 14:23:06 +00:00
Treehugger Robot
c764cb634d Merge "Use new UnsupportedAppUsage annotation." 2020-01-15 13:29:02 +00:00
Automerger Merge Worker
dbefc5e6ac Merge "Allow opening tethering when data saver ON" am: bd7fa99584 am: 80cc1ede37
Change-Id: If569a0471eb59c244965c01b02aae71b49dc05a8
2020-01-15 07:15:19 +00:00
Mark Chien
bd7fa99584 Merge "Allow opening tethering when data saver ON" 2020-01-15 06:58:29 +00:00
Automerger Merge Worker
6b4bfac72e Merge "Enlarge EPSILON to 0.01 for android.display.cts.DisplayTest#testModeSwitch pass" am: b8c95a647f am: 5a55dce12d
Change-Id: If3ad63af5c4eeeef7fa7946ddb56edca5009cdc7
2020-01-15 05:53:07 +00:00
Treehugger Robot
b8c95a647f Merge "Enlarge EPSILON to 0.01 for android.display.cts.DisplayTest#testModeSwitch pass" 2020-01-15 05:37:54 +00:00
Automerger Merge Worker
c6a841b77b Merge changes from topic "sp06-offloadcontroller" am: 01d30a4ce0 am: b61116705a
Change-Id: I6cfdf69a9752a481e5c03780ac596f5b4cbd4eb2
2020-01-15 05:17:18 +00:00
Junyu Lai
01d30a4ce0 Merge changes from topic "sp06-offloadcontroller"
* changes:
  [SP09] Remove NetworkStatsService @hide usage in Tethering
  [SP08] re-calculate interface quota when limit reached
  [SP07] Remove reference of NetworkStatsService in IpServer
  [SP06.1] Add UPDATE_DEVICE_STATS permission to Tethering
  [SP06] Use system API to communicate with NSS in OffloadController
  Use Context#getSystemService to get network stack binder
2020-01-15 04:50:27 +00:00
Automerger Merge Worker
3173e5db01 Merge "Replace usages of ServiceState#getDataNetworkType" am: 922ec35d28 am: 6875770a4e
Change-Id: Ibf29269e9e0514fe3604f6fa0a2056b0a44c211b
2020-01-15 04:28:09 +00:00
Treehugger Robot
922ec35d28 Merge "Replace usages of ServiceState#getDataNetworkType" 2020-01-15 04:05:36 +00:00
Automerger Merge Worker
0090148031 Merge "Audioservice:do not supress music volume adjustment" am: 24f8ed2d98 am: 4c8aed88bc
Change-Id: I10e4e4aec1a868bb663933e4ab2c34f231efd525
2020-01-15 03:23:51 +00:00
sqian
1e28948aaa Cleanup ITelephony in TelephonyPermissions with new System API.
This method is used by Telephony Module for permission checking.

Test: manual; cts; unit tests in other CLs
Bug: 145688189
Change-Id: Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a
Merged-In: Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a
Merged-In: If3adcd17916be2e81497061120d1f350bfb8026d
(cherry picked from commit 145294168f)
2020-01-15 02:53:32 +00:00
Jean-Michel Trivi
24f8ed2d98 Merge "Audioservice:do not supress music volume adjustment" 2020-01-15 02:42:04 +00:00
Automerger Merge Worker
dc39d0f25f Merge "Remove wake lock checks from TimeDetectorStrategy" am: dc20cafcc1 am: 258588ecb9
Change-Id: I0c98a75165e8b289a45044cb43ef22678c81a935
2020-01-14 23:59:27 +00:00
Neil Fuller
dc20cafcc1 Merge "Remove wake lock checks from TimeDetectorStrategy" 2020-01-14 23:05:19 +00:00
Philip P. Moltmann
c03b32c406 DO NOT MERGE Fix AppOpsServiceTest
- Mock LocalService dependency
- Always assume calling app has appropriate permissions

Test: atest atest FrameworksMockingServicesTests:com.android.server.appop
Fixes: 132274015
Bug: 146463528
Bug: 146590200
Change-Id: Ie816e0c6c81ecf25d37f05187591ca0d1edf0bc2
2020-01-14 14:10:40 -08:00
David Su
16fc91a1c1 NetworkScoreManager: Expose SCORE_FILTER_* consts
Rename CACHE_FILTER_* constants to SCORE_FILTER_*
and expose them as @SystemApi so they can be used
by the Wifi module.

Bug: 135998869
Test: compiles
Change-Id: I9eab2e84d0b00fada7629a104566c1099f8b1288
Merged-In: I9eab2e84d0b00fada7629a104566c1099f8b1288
2020-01-14 14:01:33 -08:00
Automerger Merge Worker
0b23099611 DO NOT MERGE Don't throw exception in AppOpsManager.checkOp am: 892ded1e8a
Change-Id: I929325ddb54bd6a7ffd256b1b3327c98dc85bc18
2020-01-14 19:56:11 +00:00
Philip P. Moltmann
892ded1e8a DO NOT MERGE Don't throw exception in AppOpsManager.checkOp
In Q we handled the case where the op does not match the package name by
returning the default state. NoteOp and StartOp returned errored.

Fix up these scenarios.

Test: - atest CtsAppOpsTestCases
      - backported new test to Q to verify the behavior is the same in Q
        and master
Bug: 132885449
Bug: 146463528
Bug: 146590200
Bug: 147649036
Change-Id: I5b94e92af759580f2d2644ece49f159bd006b31c
2020-01-14 19:43:02 +00:00
Philip P. Moltmann
73e2690ede DO NOT MERGE Remove unnecessary internal APIs.
Test: Built
Bug: 146463528
Bug: 146590200
Bug: 147649036
Change-Id: I5391ac4989d7d5712982f5608f9fc28cf7935b00
2020-01-14 19:42:44 +00:00
Rambo Wang
818cf71da8 Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer
StringNetworkSpecifier is widely used to specify subscription id for
the NetworkRequest. The raw string field introduce ambiguity and leave
large space for bugs. With TelephonyNetworkSpecifer, we are able to
settle down the type and value of the fields (although currently only
one) and introduce validation to detect the bug in the beginning.

Bug: 145993724
Test: atest FrameworksNetTests FrameworksTelephonyTests &
      make offline-sdk-docs
Change-Id: Iefbad9b1deb3de2c0b262d9ce5ae0704a50d08a6
2020-01-14 10:51:11 -08:00
Artur Satayev
53ada2ab28 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a
Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-14 15:54:55 +00:00
markchien
3fe660bc4a Allow opening tethering when data saver ON
When data saver enabled, tethering would be OFF.
Currently settings would not allow user to turning tethering back.
After aosp/1181583 is merged, user can turn tethering back without
turning data saver OFF.

Bug: 145711175
Bug: 142374233
Test: atest TetheringTests
      OFF/ON tethering when data saver ON

Change-Id: I59e662ba771a563f5f1766ba29e05246b8280220
2020-01-14 20:15:31 +08:00
junyulai
661daf9b9a [SP08] re-calculate interface quota when limit reached
Some providers might hit the limit reached event prior to
others. Thus, re-calculate and update interface quota for
every provider is needed.

This change also removes the lock that held by NPMS while
requesting NSS force update, which seems unnecessary and
might cause potential deadlock in future.

Test: atest NetworkStatsServiceTest
Test: atest NetworkPolicyManagerServiceTest

Bug: 130855321
Change-Id: I84a08ecfb14c61023fa9f1c98af73d3ee90acef6
2020-01-14 20:15:11 +08:00
Philip P. Moltmann
0bba8d5ff9 DO NOT MERGE SetMode: Don't call into PM with AppOps lock held
In the setmode paths do not call into package manager with the app-ops
lock held. Otherwise we might get dead-locks then someone calls into
app-ops manager with the package manager lock held.

Test: Booted and saw no errors from the changed code
Bug: 124731615
Bug: 146463528
Bug: 146590200
Bug: 147649036
Change-Id: If074bed1bd246a81791a7d9fd656f42f1a755495
(cherry picked from commit ec142a52fe)
2020-01-14 09:47:32 +00:00
Howard Chen
c6f64c44eb Support multiple DSU installations
Bug: 144247097
Test: adb shell am start-activity \
        -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
        -a android.os.image.action.START_INSTALL \
        -d file:///storage/emulated/0/Download/system.raw.gz \
        --el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
        --el KEY_USERDATA_SIZE 8589934592
Change-Id: Ib2f86039c4c0c1dae2bc94a702721572567bcbf2
2020-01-14 02:20:47 +00:00
Automerger Merge Worker
c901af2197 Merge "Update owners files with new team members" am: bd7c75490e am: 725a17dd2d
Change-Id: I56bac4518021dc15787d79a9902fa8a6fea4887d
2020-01-14 02:17:14 +00:00
Automerger Merge Worker
5c9fe3df4a Merge "Support reevaluation request from captive portal app" am: ba43c13e77 am: 92718acb09
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
peng.gu
bc5068c64b Enlarge EPSILON to 0.01 for android.display.cts.DisplayTest#testModeSwitch pass
Device fresh rate (60.0024) is larger than USER_SETTING_PEAK_REFRESH_RATE(60)

The difference is more than EPSILON (0.001), which will make the mode invalid the cts-on-gsi case : android.display.cts.DisplayTest#testModeSwitch will fail

Change-Id: Ie8adaf2d00280560111486d63ff774f47c2eace2
2020-01-14 02:15:43 +00:00
Treehugger Robot
bd7c75490e Merge "Update owners files with new team members" 2020-01-14 01:43:41 +00:00
Chiachang Wang
ba43c13e77 Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00
Jeffrey Huang
e77476a9bb Update owners files with new team members
Test: N/A
Change-Id: I48dddae02c9c377f705094d9b58dbe3e2128ac7b
2020-01-13 23:51:27 +00:00
Automerger Merge Worker
8d2f9806c7 Merge "Add Callback for Registration Failure" am: 93db49faec am: 5532d79f90
Change-Id: I5e6e2b3b41b24e6122963644633d63d14e8a7605
2020-01-13 21:24:06 +00:00