Commit Graph

400817 Commits

Author SHA1 Message Date
Lorenzo Colitti
baed7690a2 Merge "Stop depending on the ConnectivityService default request." am: e62097f71d am: 15f89ada84
am: 2dfe01def9

Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe
2019-01-23 08:36:21 -08:00
TreeHugger Robot
a28407a496 Merge "Define Nfc statistic data atoms" 2019-01-23 16:32:50 +00:00
Lorenzo Colitti
2dfe01def9 Merge "Stop depending on the ConnectivityService default request." am: e62097f71d
am: 15f89ada84

Change-Id: I93532a44b070dfbca74e8b68c3e26aa96ed5c480
2019-01-23 08:25:19 -08:00
Lorenzo Colitti
15f89ada84 Merge "Stop depending on the ConnectivityService default request."
am: e62097f71d

Change-Id: Iae908cb959d50870923bce4dbe1bfed5f4c26c2c
2019-01-23 08:14:33 -08:00
TreeHugger Robot
a3382a4fef Merge "Deprecate InputMethodService#onViewClicked()" 2019-01-23 16:04:52 +00:00
TreeHugger Robot
3a02bebb34 Merge changes Ic8db00b6,I68a91e07,I860ad443
* changes:
  Remove package name from ROLLBACK_EXECUTED broadcast.
  Use VersionedPackage in PackageRollbackInfo.
  Assign a rollbackId to all rollbacks.
2019-01-23 15:49:41 +00:00
Yohei Yukawa
438f6799e9 Let RemoteInputView call setTextOperationUser() only once
This is a small follow up to my previous CL [1], which made
RemoteInputView call TextView#setTextOperationUser() so that the text
operation uesr ID can be determined by the notification user ID.

Since the relationship between NotificationEntry and RemoteInputView
is immutable, there is no need to call setTextOperationUser(null) to
reset the target user ID in RemoteInputView#reset(), which may have
some race conditions.

With this CL, RemoteInputView calls setTextOperationUser() only once
immediatelly after inflation.

 [1]: Ibabe13e5b85e5bb91f9f8af6ec07c395c25c4393
      7276946b92

Bug: 120744418
Bug: 123043618
Test: atest SystemUITests
Test: Manually tested Bug 120744418 scenario as follows.
  1. Build and flash an AOSP build
  2. adb root
  3. adb shell setprop persist.debug.per_profile_ime 1
  4. adb reboot
  5. Install Test DPC
  6. Enable managed profile with Test DPC
  7. make -j SoftKeyboard
  8. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  9. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
 10. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
 11. make -j EditTextVariations
 12. adb install -r $ANDROID_TARGET_OUT_TESTCASES/EditTextVariations/EditTextVariations.apk
 13. adb shell am start --user 0 \
     -n com.android.inputmethod.tools.edittextvariations/.EditTextVariations
 14. Tap the menu icon on the EditTextVariations then click "Direct Reply"
 15. adb shell am start --user 10 \
     -n com.android.inputmethod.tools.edittextvariations/.EditTextVariations
 16. Tap the menu icon on the EditTextVariations then click "Direct Reply"
 17. Open notification shade.
 18. Tap reply icon on "Message from UserHandle{0}".
 19. Make sure that SoftKeyboard Sample IME is shown.
 20. Tap reply icon on "Message from UserHandle{10}".
 21. Make sure that AOSP Keyboard is shown.
 22. Tap reply icon on "Message from UserHandle{0}" again.
 23. Make sure that SoftKeyboard Sample IME is shown again.
Test: Manually tested Bug 123043618 scenario as follows.
  1. Build and flash an AOSP build
  2. Create a secondary user then switch to it.
  3. make -j SoftKeyboard
  4. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  5. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  6. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
  7. make -j EditTextVariations
  8. adb install -r $ANDROID_TARGET_OUT_TESTCASES/EditTextVariations/EditTextVariations.apk
  9. adb shell am start \
     -n com.android.inputmethod.tools.edittextvariations/.EditTextVariations
 10. Tap the menu icon on the EditTextVariations then click "Direct Reply"
 11. Tap reply icon on "Message from UserHandle{10}".
 12. Make sure that SoftKeyboard Sample IME is shown.
 13. Type "ggggg" then hit the space key.
 14. Make sure that red underline is drawn under "ggggg"
 15. Make sure that AndroidSpellCheckerService runs as user 10.
Test: Manually tested multi-user scenario with per-profile mode as follows.
  1. Build and flash an AOSP build
  2. adb root
  3. adb shell setprop persist.debug.per_profile_ime 1
  4. adb reboot
  5. Create a secondary user then switch to it.
  6. make -j SoftKeyboard
  7. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  8. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  9. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
 10. make -j EditTextVariations
 11. adb install -r $ANDROID_TARGET_OUT_TESTCASES/EditTextVariations/EditTextVariations.apk
 12. adb shell am start \
     -n com.android.inputmethod.tools.edittextvariations/.EditTextVariations
 13. Tap the menu icon on the EditTextVariations then click "Direct Reply"
 14. Tap reply icon on "Message from UserHandle{10}".
 15. Make sure that SoftKeyboard Sample IME is shown.
 16. Type "ggggg" then hit the space key.
 17. Make sure that red underline is drawn under "ggggg"
 18. Make sure that AndroidSpellCheckerService runs as user 10.
Change-Id: I975baa748c821538e5a733bb98a33ac609bf40a7
2019-01-23 07:43:34 -08:00
Yiwen Chen
57406a7e0e Merge "Add Ramping Ringer platform flags and fix some Ringtone bugs." 2019-01-23 15:20:08 +00:00
Gus Prevas
30dc072134 Merge changes I636dbbc4,Idd0711a7
* changes:
  Implements flinging for anchor-based scrolling.
  Implements basic anchor-based scrolling.
2019-01-23 15:00:10 +00:00
Jorim Jaggi
f72ad8d08a Merge "Fix tests" 2019-01-23 14:35:27 +00:00
Jorim Jaggi
fae3e276b1 Fix tests
Test: atest InsetsAnimationControlImplTest
Bug: 118118435
Change-Id: I92f5a91b24d3441c092c9dab55d9340b7da3ab14
2019-01-23 14:35:05 +00:00
Adrian Roos
38c8934b67 Merge "API: Fix missing @NonNull annotations" 2019-01-23 14:02:15 +00:00
TreeHugger Robot
2288bdc9ab Merge "New extra and helper methods to set screenlock to a specific complexity level" 2019-01-23 13:59:21 +00:00
Richard Uhler
f8f1b38fd1 Remove package name from ROLLBACK_EXECUTED broadcast.
The receiver of the broadcast would likely want to query the rolled back
packages via RollbackManager regardless, and it's not clear which
package to put when an atomic set of packages is rolled back.

Bug: 112431924
Test: atest RollbackTest
Change-Id: Ic8db00b62d8993e00a0dd2cb79ae68c430b45bb8
2019-01-23 13:22:44 +00:00
TreeHugger Robot
448fb122a1 Merge "Remove Constructor of RemoteUserInfo which takes IBinder" 2019-01-23 13:20:46 +00:00
TreeHugger Robot
bdba7efd10 Merge "Show only recent accesses" 2019-01-23 13:15:21 +00:00
TreeHugger Robot
de3aea6904 Merge "Add an intent extra that contains a number of milliseconds." 2019-01-23 13:13:47 +00:00
Hyundo Moon
4d69df3eb1 Merge "Set MediaSession.mCallback as non-null when a callback is set" 2019-01-23 12:57:24 +00:00
Hyundo Moon
b016fa8bf7 Merge "Use MediaParceledListSlice in ControllerCallbackLink" 2019-01-23 12:57:18 +00:00
Varun Shah
f71cb5ac32 Merge "Revert "Optimize service restart logic."" 2019-01-23 12:45:24 +00:00
Luke Huang
7a4c67ec21 Merge "Netd unsolicited event porting" am: 98f0c30911 am: 6303689d0f
am: 5c77cae9e5

Change-Id: I0b3783fbbe9c69d625e9ecc38a26e375b6e06787
2019-01-23 04:39:09 -08:00
Lorenzo Colitti
e62097f71d Merge "Stop depending on the ConnectivityService default request." 2019-01-23 12:29:40 +00:00
Luke Huang
5c77cae9e5 Merge "Netd unsolicited event porting" am: 98f0c30911
am: 6303689d0f

Change-Id: I79818efb3ebcc41b020c6442aa023cd9b46bda53
2019-01-23 04:24:30 -08:00
Luke Huang
6303689d0f Merge "Netd unsolicited event porting"
am: 98f0c30911

Change-Id: I13d8a53368850b07a65e42adc5d3f5fd0575c12a
2019-01-23 04:14:17 -08:00
Luke Huang
98f0c30911 Merge "Netd unsolicited event porting" 2019-01-23 12:02:14 +00:00
TreeHugger Robot
a9b062d0bc Merge "AudioEffect: make Descriptor not final" 2019-01-23 12:01:47 +00:00
Chalard Jean
dccea36b52 Merge "[MS11] Implement findL2Key" am: 773f3f5bf3 am: 21c8257178
am: f1c3019d42

Change-Id: I768bc38b4f7d184842f49f6c0a5ac621020d2bd4
2019-01-23 03:37:45 -08:00
Chalard Jean
f1c3019d42 Merge "[MS11] Implement findL2Key" am: 773f3f5bf3
am: 21c8257178

Change-Id: I3005b92ab49ed79f854614281ef09fe5dbeea5c9
2019-01-23 03:24:20 -08:00
Chalard Jean
21c8257178 Merge "[MS11] Implement findL2Key"
am: 773f3f5bf3

Change-Id: If429108eddc802f0c13f7b10048b1fe87bd51b22
2019-01-23 03:14:56 -08:00
TreeHugger Robot
ed9c5ef608 Merge "Small fixes of MediaSession" 2019-01-23 11:07:33 +00:00
Richard Uhler
a7e9b2db4b Use VersionedPackage in PackageRollbackInfo.
Rather than defining a new custom PackageRollbackInfo.PackageVersion
type.

Also clean up PackageRollbackInfo API by replacing public fields with
methods and picking better names.

Bug: 112431924
Test: atest RollbackTest
Change-Id: I68a91e07b8745df9c5ecb22fdccbfcd76385814a
2019-01-23 11:02:56 +00:00
Richard Uhler
b9d54474ad Assign a rollbackId to all rollbacks.
To make it easier to specify what rollback to perform when a rollback is
executed.

Bug: 112431924
Test: atest RollbackTest
Change-Id: I860ad443848341fbb99169a05b084fa797c5e08c
2019-01-23 11:02:42 +00:00
Treehugger Robot
773f3f5bf3 Merge "[MS11] Implement findL2Key" 2019-01-23 11:01:43 +00:00
TreeHugger Robot
daf5dc917d Merge "Remove hidden API in Session2Token" 2019-01-23 10:57:42 +00:00
TreeHugger Robot
eea1710cda Merge "Add a feature flag for secure lock screen." 2019-01-23 10:55:33 +00:00
TreeHugger Robot
d133e9f40c Merge "Use link in the doc for MediaSession2Service" 2019-01-23 10:19:31 +00:00
Denny cy Lee
c5a7c29581 DeviceIdle: Support aggressive/unaggressive doze mode
Test: atest com.android.server.DeviceIdleControllerTest
Bug: 121167278
Change-Id: I3bc645a23a6a93e120f12a9a3fa5cf038fa6ca8f
2019-01-23 09:51:37 +00:00
TreeHugger Robot
e07fb110dd Merge "Log an error on package not found in DefaultPermissionGrantPolicy" 2019-01-23 09:48:41 +00:00
Alan Stokes
d7c5450f45 Merge "Add logging of dynamic loading of native code." 2019-01-23 09:36:27 +00:00
Luke Huang
d121dd2aa5 Merge changes from topic "Java async dns" am: 31ff0616d1 am: a8e16262f1
am: e052154abb

Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0
2019-01-23 01:24:21 -08:00
Luke Huang
e052154abb Merge changes from topic "Java async dns" am: 31ff0616d1
am: a8e16262f1

Change-Id: I305cf0ae791f9503519884bdf382863002357ac7
2019-01-23 01:14:34 -08:00
Lorenzo Colitti
ed3168e9e3 Stop depending on the ConnectivityService default request.
This avoids the need to expose ConnectivityService implementation
details as @SystemApi and the complexities that would be required
to make NetworkCapabilities parcelable in stable AIDL.

Bug: 112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Icd5d25b9b8e9b7a7d1899b000c92dc4976c3b3d7
2019-01-23 18:10:06 +09:00
Luke Huang
a8e16262f1 Merge changes from topic "Java async dns"
am: 31ff0616d1

Change-Id: Ia08a8300887315d673f398b1340b2f44ce501b14
2019-01-23 01:06:19 -08:00
Narayan Kamath
1addc53a77 Merge "RollbackManager: Support userdata snapshot / restore." 2019-01-23 09:03:17 +00:00
TreeHugger Robot
9c6e668b47 Merge "Process DEEP_PRESS in GestureDetector" 2019-01-23 08:51:08 +00:00
Luke Huang
31ff0616d1 Merge changes from topic "Java async dns"
* changes:
  Add asynchronous DNS query API in Java
  Add jni method for DnsResolver
2019-01-23 08:48:23 +00:00
Sungsoo Lim
a65bce588b Remove hidden API in Session2Token
Test: build
Change-Id: I99479aace7d45486d6c6e1daeb7d7d87937bcbb4
2019-01-23 17:47:39 +09:00
Android Build Merger (Role)
ffb97186f7 Merge "Merge "Skeleton implementation of Bluetooth metadata APIs" am: 625a1f4461 am: 2f1cba20a5 am: 716eb586ac" 2019-01-23 08:25:50 +00:00
Ugo Yu
250227d18b Merge "Skeleton implementation of Bluetooth metadata APIs" am: 625a1f4461 am: 2f1cba20a5
am: 716eb586ac

Change-Id: I0ac4ea988598a190d4c14378c072def122f4257e
2019-01-23 00:24:02 -08:00
Luke Huang
d290dd5150 Netd unsolicited event porting
Test: atest FrameworksNetTests passes
Test: 1. manual test datacall/wifi work
      2. manual test tethering work
      3. run cts StrictModeTest pass
      4. manual test data alert work
      5. manual test idletimer work

Change-Id: Ia4c12510c9c97fed76e4b31fb9756c28fff72853
2019-01-23 16:18:01 +08:00