391960 Commits

Author SHA1 Message Date
Fan Zhang
08d236c4ff Take a context to start setting intent in DreamBackend
Change-Id: I76d3751c950b1af9065d58b3b740736b3432606d
Fixes: 111375261
Fixes: 113312592
Test: rebuild
(cherry picked from commit ea945ada874bcaa09bbd61b1697efaac57a71b90)
2018-11-06 23:47:10 +00:00
Alex Light
7901714521 Merge "Correct illegal mockito usage."
am: 5bb1e8c9bc

Change-Id: Ib8c6436b72d0cbb7133a9a2b0586f8263adf598e
2018-11-06 15:44:46 -08:00
Brad Ebinger
e1219c73ef Merge "Expose mRestrictCause as a @SystemApi" am: 37d8de2b2a am: f40eeb4a18
am: 5671e61407

Change-Id: Id06585c73f8423a5e2e21412f360cc9b4c3e0982
2018-11-06 15:37:37 -08:00
Tyler Gunn
009b2dd158 Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov." 2018-11-06 23:32:05 +00:00
Alex Light
5bb1e8c9bc Merge "Correct illegal mockito usage." 2018-11-06 23:28:15 +00:00
Brad Ebinger
5671e61407 Merge "Expose mRestrictCause as a @SystemApi" am: 37d8de2b2a
am: f40eeb4a18

Change-Id: I59adcd2b31bdf0f7258b424d55f6e96913c729dc
2018-11-06 15:22:43 -08:00
Brad Ebinger
f40eeb4a18 Merge "Expose mRestrictCause as a @SystemApi"
am: 37d8de2b2a

Change-Id: I6385af068774745f675d6c6568b883e75a813034
2018-11-06 15:11:47 -08:00
Varun Shah
a253644272 Updated documentation for OnSharedPreferenceChangeListener.
Clarified that #onSharedPreferenceChanged does not get called after
Editor#clear.

Bug: 117752822
Test: atest cts/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java#testSharedPrefsChangeListenerIsCalledOnCommit
Test: atest cts/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java#testSharedPrefsChangeListenerIsCalledOnApply
Change-Id: I6fd33d13ae706882131dafdfe0d095f9b48a1744
2018-11-06 15:07:52 -08:00
Jeff Tinker
b78ee406fd Clean up some nested template formatting
test:compiles
Change-Id: I153561feb182ac50a0e99aaf360adecd54300937
2018-11-06 23:04:45 +00:00
Michael Groover
3f0267151c Enable device identifier check for 3P apps
Bug: 117781266
Test: cts-tradefed run cts -m CtsTelephony3TestCases
Test: cts-tradefed run cts -m CtsPermissionTestCases -t android.permission.cts.TelephonyManagerPermissionTest
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCannotGetDeviceIdentifiersWithoutPermission
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCannotGetDeviceIdentifiersWithoutPermission

Change-Id: Ia511d6d566ab1ceacfedcd45f45500a846fcb983
2018-11-06 15:01:46 -08:00
Brad Ebinger
37d8de2b2a Merge "Expose mRestrictCause as a @SystemApi" 2018-11-06 22:54:10 +00:00
Hai Zhang
c595f112db Add AppOpsManager.opToDefaultMode() as system API.
PermissionController needs to know the default mode of an app op and
adjust it in case a background permission is fixed to revoked while a
foreground permission is not for a pre-M app, because simply resetting
the app op to its default mode might break the fixed state of the
background permission.

This change also removes AppOpsManager.resetUidMode() since it was
introduced for the same use case in PermissionController but cannot
handle the above case cleanly.

Bug: 110557011
Test: build
Change-Id: I53b1b375381a46b7dbece3cddaac460352d0336d
2018-11-06 14:49:54 -08:00
Adam Bookatz
3f5b30c42e Merge "Minor comment fix in StatsLogProcessor" 2018-11-06 22:41:45 +00:00
Beverly Tai
d6a4c6768e Merge "Move UiThreadTest annotation to class" 2018-11-06 22:26:58 +00:00
Pengquan Meng
1264b640f5 Merge "Move configs to CarrierConfig for MobileNetworkSettings" 2018-11-06 22:26:07 +00:00
Alex Light
84faaf8ec6 Correct illegal mockito usage.
According to the mockito FAQ use of thenReturn(mock(...)) is
forbidden. This fixes that pattern in the setup for
ZenModeFilteringTest.

https://github.com/mockito/mockito/wiki/FAQ#can-i-thenreturn-an-inlined-mock-

Test: runtest systemui-notification
Bug: 119063276
Change-Id: Ic62b18063e5837240255e1dd0f5e0feb450f22cb
2018-11-06 14:15:54 -08:00
Roshan Pius
4e415edecd WifiManager: Mark isScanAlwaysAvailable() deprecated
This API is useful for the apps to decide when they can issue a scan
request. Since WifiManager.startScan() is deprecated, this should be
too. There is no functionality change for now, just a warning
that this will go away along with startScan().

Bug: 74448981
Test: `make api-stubs-docs-update-current-api`
Change-Id: I5310dc53dae244d7a99319bbde111254e9097a14
2018-11-06 13:46:30 -08:00
Eugene Susla
3d171b2a0f Merge "Use PM instead of PMI in DefGrantPolicy for simple cases" 2018-11-06 21:29:52 +00:00
Felipe Leme
a7bdb1486e Refactored InteractionSessionId.
Rather than use a local and global id, just use a local, unique id.

Such change not only simplifies the code, but makes it consistent with
TextClassificationSessionId.

Test: mmm -j packages/experimental/FillService && \
      adb install -r ${OUT}/data/app/FillService/FillService.apk && \
      adb shell settings put secure intel_service foo.bar.fill/.AiaiService
Bug: 111276913

Change-Id: I0e610f825aab1d2b32bbafa1bd3d3c7897d889d6
2018-11-06 13:09:03 -08:00
Felipe Leme
7a53408d19 Initial implementation of IntelligenceService.onContentCaptureEvents()
It's only implementing the activity lifecycle events, but at least they're fed
end-to-end in the pipeline (from app to service implementation).

Test: mmm -j packages/experimental/FillService && \
      adb install -r ${OUT}/data/app/FillService/FillService.apk && \
      adb shell settings put secure intel_service foo.bar.fill/.AiaiService
Bug: 111276913

Change-Id: I2f46be1e6a6a21ad909e5fffea01bedaa28fb300
2018-11-06 13:02:48 -08:00
Beverly Tai
9a81857fde Merge "Temporarily disable ZenModeFiltering tests" 2018-11-06 21:00:41 +00:00
Felipe Leme
179a9dccb0 Merge "Initial implementation of the IntelligenceService pipeline." 2018-11-06 20:57:16 +00:00
Eugene Susla
4abd2e6d58 Use PM instead of PMI in DefGrantPolicy for simple cases
This is a step wowards eventually moving DPGP to a mainline module

Test: gts-tradefed run singleCommand gts -m GtsPermissionTestCases -t com.google.android.permission.gts.DefaultPermissionGrantPolicyTest
Change-Id: I81118bcad7faed8d72343cb81300d3478ee13838
2018-11-06 20:45:56 +00:00
Tony Mak
c6f53ea93e Smart actions and replies feature should not be guarded by
... AUTO_DEMOTE_NOTIFICATIONS

Test: Found smart suggestions in notification again

BUG: 119122162
Change-Id: Iee8e559e02e91f0b3045d72f752741d53536b0c8
2018-11-06 20:02:54 +00:00
Beverly
c4305e6ed3 Move UiThreadTest annotation to class
Test: atest SystemUITests
Fixes: 119100256
Change-Id: If7ea830e2699fcaeeb25678f483982732459b453
2018-11-06 19:48:58 +00:00
Android Build Merger (Role)
f678a87c92 Merge changes from topic "am-4601e3b1584e408da71c5f4ed61d7df2"
* changes:
  Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe am: 3e312d20cd am: e217b6222c
  Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2 am: 65200cf70e am: bd7c4efbb6
2018-11-06 19:42:34 +00:00
Colin Cross
872fd51397 Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe am: 3e312d20cd
am: e217b6222c

Change-Id: Ib4c806582d5445c8387054dbc6fe2f6e173f1a97
2018-11-06 11:41:02 -08:00
Jeff Davidson
e1b3686faa Merge "Add support for illustrations to SimAppDialog." 2018-11-06 19:34:32 +00:00
Colin Cross
43ac27281b Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2 am: 65200cf70e
am: bd7c4efbb6

Change-Id: Id4bab0ce60f08ce358db99c67c58cbef0fe6e589
2018-11-06 11:34:29 -08:00
Colin Cross
e217b6222c Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe
am: 3e312d20cd

Change-Id: I096f3b5a5a985ce7926ccb71fa07eda69d078ed3
2018-11-06 11:21:11 -08:00
Beverly
c85c9c5748 Temporarily disable ZenModeFiltering tests
failing on cloud devices
Bug: 119063276
Bug: 119100256
Test: atest ZenModeFilteringTest
Change-Id: I5dcab2bfb0fd3be31e1fc9ab2706ed558c5968fb
2018-11-06 14:15:49 -05:00
Colin Cross
bd7c4efbb6 Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2
am: 65200cf70e

Change-Id: I952a9cbcb9bf9d2d479efecc28c5411e31dc9cf6
2018-11-06 11:15:44 -08:00
TreeHugger Robot
78515967f0 Merge "Do not clip the pulsing notification panel" 2018-11-06 19:05:47 +00:00
Colin Cross
3e312d20cd Merge changes from topic "revert-protobuf3.5.2"
am: a4680e1ebe

Change-Id: Iae43445ebe8f2c3a702e69c75b5444c81d68dc61
2018-11-06 11:03:10 -08:00
Jack Yu
423e575909 Merge "Added APN to string method" am: 3bedd0a674 am: 56ce3a6f41
am: 94107f2fea

Change-Id: I88945b7e9492e2712d0c74456b6f645fe2ead187
2018-11-06 11:01:17 -08:00
Colin Cross
65200cf70e Revert "Convert statsd_test and statsd_benchmark to proto lite"
am: 47046b80d2

Change-Id: I7b00b3ddfe15978058ea5ae6979f8c382d488292
2018-11-06 10:56:40 -08:00
Seigo Nonaka
c1b6ab69c6 Introduce new API for specifying user font fallback
Bug: 111133573
Test: atest TypefaceCustomFallbackBuilderTest
Change-Id: I0345824ecd475e43dbb5e5451f647020c4b53a83
2018-11-06 10:56:30 -08:00
Jack Yu
94107f2fea Merge "Added APN to string method" am: 3bedd0a674
am: 56ce3a6f41

Change-Id: I61247c8f7e8f5069b28167b9e940782f80edfaee
2018-11-06 10:48:00 -08:00
Colin Cross
a4680e1ebe Merge changes from topic "revert-protobuf3.5.2"
* changes:
  Revert "Adapt to google::protobuf::uint64 type change"
  Revert "Convert statsd_test and statsd_benchmark to proto lite"
2018-11-06 18:42:03 +00:00
Bookatz
9cc7b660a9 Minor comment fix in StatsLogProcessor
Test: none; it's just a comment
Change-Id: Iafd9a5264eb13502509e7466c2773b0d5536170c
2018-11-06 10:39:21 -08:00
Jack Yu
56ce3a6f41 Merge "Added APN to string method"
am: 3bedd0a674

Change-Id: Ifd75ed08c0edabd228af3a5b654fb499afff2ef2
2018-11-06 10:38:46 -08:00
Yohei Yukawa
6d4ffc67a5 Fix import lines in SystemServer.java
Test: compile
Change-Id: I967379d511fd3853dfef81834f8c3dbc8db4f4c2
2018-11-06 10:38:01 -08:00
Jack Yu
3bedd0a674 Merge "Added APN to string method" 2018-11-06 18:19:31 +00:00
Hai Shalom
709893b733 [WPA3] Fix WifiConfigurtionTest to support OWE as open network
Fix WifiConfigurtionTest to support OWE as open network.

Bug: 112195778
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ie751e3c80c3f39f98723d91e37845006ec65694f
2018-11-06 10:11:07 -08:00
Hai Shalom
6adbc58858 [WPA3] Add new types for WPA3/OWE and device capabilities API
Add new types for WPA3: SAE and Suite-B-192, and Enhanced open: OWE.
Added a new API to get the device key management capabilities, because
not all devices using latest HAL have WPA3/OWE support. Updated
current.txt and system-current.txt accordingly.

Bug: 112195778
Test: atest com.android.server.wifi

Change-Id: Idceb28dd8663349013243f69b8f20c0c8606581c
2018-11-06 10:11:07 -08:00
Felipe Leme
e348dc3486 Initial implementation of the IntelligenceService pipeline.
It's still full of TODOs, but at leats it now provides an end-to-end
workflow from the activity creation / destruction to the service implementation.

Test: mmm -j packages/experimental/FillService && \
      adb install -r ${OUT}/data/app/FillService/FillService.apk && \
      adb shell settings put secure intel_service foo.bar.fill/.AiaiService
Bug: 111276913

Change-Id: Id5daf7b8b51e97c74d9b6ec00f953ddb02b48e46
2018-11-06 10:01:02 -08:00
TreeHugger Robot
67dd91e6a3 Merge "Remove Vibrator Shell Command Time Limit" 2018-11-06 17:53:39 +00:00
Roshan Pius
d84d668d45 Merge changes from topic "network_request_match_callback"
* changes:
  WifiManager: Network request match callback registration
  wifi(API): NetworkSpecifier for Wifi NetworkAgent
  wifi(API): Mark old API's deprecated
  wifi(API): New API surface for network suggestion
  wifi(API): New API surface for connection via NetworkRequest
2018-11-06 17:42:58 +00:00
Tadashi G. Takaoka
1cc9e5a9f0 [automerger skipped] Merge "Fix missing showWhenLocked activity attribute" am: f1e9db0cbe am: cfbbe2d89d
am: e2e5daf291  -s ours

Change-Id: Ia5d2bc8e920eeeaef1cdbde957b50f662abd5e2c
2018-11-06 09:33:56 -08:00
Jeff Davidson
36798b60c5 Add support for illustrations to SimAppDialog.
Previously these were provided in build-time resource overlays by
overriding the entire install_carrier_app_activity.xml layout. This is
no longer feasible with the move to runtime overlays as the layout
cannot be precisely mimicked due to depending on styles and other
parameters from the base APK (and is generally a bit more brittle).
Instead, pull in the needed container from the current overlay, add a
stub image and content description and hide the container by default
so the base APK can be compiled, and provide a boolean that can be
overridden along with the image and content description that is used
to toggle the image display at runtime.

Bug: 118823052
Test: atest GtsSimAppDialogTestCases (with and without overlay)
Change-Id: Ic706df3091ce6c9f5d64ee22da6fa61b9b7b1e3c
2018-11-06 17:31:06 +00:00