Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
490,308 Commits 3 Branches 0 Tags
ebdc01a8f3c1cf47acd25f8facfd56566fd9dd93
Commit Graph

18172 Commits

Author SHA1 Message Date
Shawn Lin
095fe5e396 Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I9ab450adab3542aa3d8b05ddccfd015dcc657a1c
 2020-06-16 09:32:54 +00:00
Shawn Lin
1c2e8eafff Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev 2020-06-16 09:32:15 +00:00
TreeHugger Robot
3679ed262e Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: I958250d37114932d7db384bf77fc3a4e742a2e1d
 2020-06-15 20:16:22 +00:00
TreeHugger Robot
9ac716fc8b Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev 2020-06-15 20:06:31 +00:00
Stanislav Zholnin
9edce64ef2 Properly handle situation when currentOpPackageName returns null. 
Fixes: 158309330
Test: adb shell content query --uri content://com.android.contacts/data --projection  contact_id:raw_contact_id:_id:display_name:last_time_used:data1:account_type:mimetype
Change-Id: I6c5d0c4fef150ba45721d474ac0f83778d543467
 2020-06-15 17:28:33 +01:00
shawnlin
2806269a5a Fixed the conflict of the release methods of ActivityView & TaskEmbedder 
There is a case in Bubble that we might release a un-initialized
TaskEmbedder while calling ActivityView.release() (ex. create a bubble
and don't expand it and then dismiss it) which will cause an exception.

Allow ActivityView.release() to be called at anytime and check the
initialization state before calling TaskEmbedder.release().

Bug: 155417004
Test: 1. Add bubbles and don't expands them then dimiss them
      2. Check logs.
Change-Id: I583ddd36f407c908cb63c109834940fc91c8d130
 2020-06-15 15:47:14 +08:00
Jordan Jozwiak
a50847e505 DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724
 2020-06-12 16:32:43 +00:00
Jordan Jozwiak
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +00:00
TreeHugger Robot
b6f3f8c8f5 Merge "Update javadoc for END_OF_DAY event." into rvc-dev am: a4c3cd425b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815144

Change-Id: Ia99822e02b14423b96985acf59f429e6c21e29b0
 2020-06-11 22:26:08 +00:00
TreeHugger Robot
a4c3cd425b Merge "Update javadoc for END_OF_DAY event." into rvc-dev 2020-06-11 22:11:50 +00:00
TreeHugger Robot
bf52673a6a Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Icc00a6f35213958cb5badfb4e7311e646608b1bf
 2020-06-11 18:41:57 +00:00
TreeHugger Robot
0561690cac Merge "Apply theme shape clipping to group convo avatars" into rvc-dev 2020-06-11 18:22:46 +00:00
Alex Johnston
c1a731879b Merge "Update setCameraDisabled javadoc" into rvc-dev am: bde41fcacf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818602

Change-Id: Ic6ee5e324cce51734d1f1f02739bf5c967c673d8
 2020-06-11 11:48:03 +00:00
Alex Johnston
bde41fcacf Merge "Update setCameraDisabled javadoc" into rvc-dev 2020-06-11 11:33:19 +00:00
Steve Elliott
86bc69a491 Apply theme shape clipping to group convo avatars 
Fixes: 158493588
Test: manual
Change-Id: I57b5e0712822b345c9dcce74b8a6d6ff33409de6
 2020-06-10 15:23:33 -04:00
Alex Johnston
0589baeae9 Update setCameraDisabled javadoc 
* DA targeting pre-Q will have this request
  silently ignored

Bug: 157212233
Test: build

Change-Id: I5b993443cdbcb2afed9f65c9d01063e7e1777842
 2020-06-10 14:48:54 +01:00
Hui Yu
d507b3256e Update javadoc for END_OF_DAY event. 
END_OF_DAY event has non-null packageName and null className.

Fix: 154842373
Test: NA
Change-Id: I3f225d459445db8416c822768f147f5b359c4ea4
 2020-06-09 16:19:21 -07:00
TreeHugger Robot
13d04ca7c7 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: Ibc7392839109a91bf5abaa3597badf158168d7aa
 2020-06-09 22:45:41 +00:00
TreeHugger Robot
6a28d69c24 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev 2020-06-09 22:41:40 +00:00
Varun Shah
4bffd45f2f Reduce "Failed to find provider info" logspam. 
If the user is not unlocked, log at the warning level instead of error
to reduce logspam from non-direct boot aware providers.

Fixes: 148747075
Test: manual (observe logs before and after user unlock)
Change-Id: Icd0fb23982a78fb413f329da93b2ce01d37aca2a
 2020-06-09 13:39:53 -07:00
TreeHugger Robot
c315e25ec7 Merge "Remove debug code before beta release." into rvc-dev am: c81dddfda6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810423

Change-Id: Id3912360601216fa259376320abcfc772981c6f0
 2020-06-09 20:21:11 +00:00
Hui Yu
cdfb1d6c30 Remove debug code before beta release. 
Remove the debug code for feature:
1. Background started FGS while-in-use permission restriction
2. Foreground service type camera and microphone.

Bug: 158579189
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerApi29Test.java
atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
atest cts/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java

Change-Id: I9669db918af3740509a090c3075d93588110cea1
 2020-06-09 10:36:57 -07:00
Hui Yu
eb487f610a Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: Ie1ac5bbc2ee1e2af4708c8e584568f8f3d6cecb3
 2020-06-09 05:14:29 +00:00
Hui Yu
c05fd22ce1 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev 2020-06-09 05:01:28 +00:00
Joanne Chung
158b81b6f0 Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I3be81b8ba85c2ed8809f2c798a543bd4ff5469fe
 2020-06-09 00:35:13 +00:00
Hui Yu
08ab384989 Add uid to PendingStartActivityUids when activity resumed. 
Previously we add uid to PendingStartActivityUids at activity start.
Now we also add uid to PendingStartActivityUids at activity resumed
because we can not wait for updateOomAdj() to be run by a runnable that
WindowManager send to DisplayThread at activity resumed.

At ActivityManagerService.getProcessStatesAndOomScoresForPIDs(), if the
ProcessRecord is in PendingStartActivityUids, we hard code the
ProcessRecord to be PROCESS_STATE_TOP and FOREGROUND_APP_ADJ, ahead of
result of updateOomAdj() the comes later.

Bug: 155143386, 157180494
Test: Reproduce steps of 155143386, swipe between GCA and
Snapchat, camera access is allowed after swipe.

Change-Id: Ia11b0e3400e4df851b250beb01dcfda43580668b
 2020-06-08 15:35:26 -07:00
Nate Myren
61ab30d2a6 Revert "Use permissionController name rather than hardcode" 
Revert submission 11618534-rename-resources

Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround

Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129
 2020-06-08 19:35:05 +00:00
Joanne Chung
c6adc68368 Handle SyncResultReceiver.TimeoutException 
1.Change SyncResultReceiver.TimeoutException to checked exception
2.Handle the SyncResultReceiver.TimeoutException in AutofillManager,
ContentCaptureManager, ContentSuggestionsManager
3.Fix the bug we should throw e.rethrowFromSystemServer()

Bug: 156044027
Test: atest CtsAutoFillServiceTestCases
Test: atest ContentSuggestionsManagerTest
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I959d2aca2b80866c076fae2520de66c123f5367d
 2020-06-08 14:53:45 +08:00
Shawn Lin
855ecdd0e8 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: I103f7db216c495c2bfeaa83506eca23923b92e1f
 2020-06-08 03:45:53 +00:00
Shawn Lin
c54d84a858 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev 2020-06-08 03:34:20 +00:00
Philip P. Moltmann
802f5b5005 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: Ieb4c0a463493723fab5f344ae6d80cfaad138e08
 2020-06-06 18:19:01 +00:00
Philip P. Moltmann
8083336a88 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev 2020-06-06 18:10:11 +00:00
Steve Elliott
eec7f12366 Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf
 2020-06-06 15:29:19 +00:00
Steve Elliott
05e10b59af Merge "Fix missing icon for one-to-one convos" into rvc-dev 2020-06-06 15:12:04 +00:00
Svetoslav Ganov
2d56a15699 Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c
 2020-06-06 15:06:03 +00:00
Svetoslav Ganov
0ce4fba38f Merge "Correctly offset app op history on reboot" into rvc-dev 2020-06-06 14:50:03 +00:00
Stanislav Zholnin
5a337a6a9f Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689275

Change-Id: I1805e5b42ddbc311677a7e80de9f5c3bcb8ffccd
 2020-06-06 14:30:43 +00:00
Stanislav Zholnin
c784a29dfd Merge "Keep unforwarded operation for noted ops." into rvc-dev 2020-06-06 14:12:38 +00:00
Stanislav Zholnin
e44f134adb Keep unforwarded operation for noted ops. 
Align treatment of noted ops with AsyncNotedOps.

Fixes: 154775996
Test: atest AppOpsLoggingTest#disableCollectedAndNoteSyncOpAndCheckLog
Change-Id: I3dcd8275b6229946875bc184d25b18d2da76d5ba
Merged-In: I3dcd8275b6229946875bc184d25b18d2da76d5ba
 2020-06-06 06:45:16 +00:00
Vinit Nayak
e5596e83cb Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I4ba1088269fec55593541d4a448cb511be5d470a
 2020-06-05 19:10:28 +00:00
Vinit Nayak
2983b70983 Merge "Pass displayId to onActivityRotation()" into rvc-dev 2020-06-05 18:58:32 +00:00
Ryan Mitchell
ccd12e5eed Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I0cd3e82bcde0625432f853b257d7fd1d0156197e
 2020-06-05 18:30:36 +00:00
Ryan Mitchell
0053a10ea0 Merge "Use a ReferenceQueue to prune weak references" into rvc-dev 2020-06-05 18:27:50 +00:00
Svet Ganov
185ddf644b Correctly offset app op history on reboot 
The offset was computed based off the offset represented by
the most recent historical file while we have to use the time
this file was written.

Also now we persist the history on reboot and shutdown,
significantly minimizing the possibility of data loss.

Added test API to emulate reboot of the history to allow for
precise and tightly controlled test to prevent flakes due to
boot time deviations.

Test: atest android.app.appops.cts.HistoricalAppopsTest#testRebootHistory

Fixes:156853195

Change-Id: I4142371f8bc2b1d710cc8c300e7e79cb03764c04
 2020-06-05 09:55:27 -07:00
Liz Kammer
e44a2b2bb8 Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp 2020-06-05 15:16:59 +00:00
shawnlin
ba532aff3e Add a @hide ctr to disable background layer in ActivityView & SurfaceView 
Bug: 152441717
Test: 1. Open bubble
      2. adb shell dumpsys SurfaceFlinger
      3. Check result
Change-Id: I3bda67bb56781eb75b51dc51f491a97efac7b4ef
 2020-06-05 16:08:37 +08:00
Vinit Nayak
bedb9f33c2 Pass displayId to onActivityRotation() 
Bug: 154580671
Change-Id: I220e1e9ac1a381c6ebadc3849a393225d1f53e3e
 2020-06-04 17:15:32 -07:00
Jordan Jozwiak
9ead5a3c05 DO NOT MERGE - Allow locking with feature or permission 
Instead of requiring the DEVICE_ADMIN feature, we accept either
the feature or the appropriate permission.

Bug: 133240910
Test: Manual testing
Verify that API executes when on a device without DEVICE_ADMIN
when the caller has the LOCK_DEVICE permission.

Change-Id: I30bd0dc81d9d7b7ed5503a926066caffb389b9c0
(cherry picked from commit 3cc489b7f3)
 2020-06-04 19:21:31 +00:00
Steve Elliott
3d360da16d Fix missing icon for one-to-one convos 
Fixes: 158089612
Test: manual
Change-Id: If588073ff1df557b755b844277e893e001822d79
 2020-06-04 11:11:11 -04:00
Riddle Hsu
cd414bdfb0 Merge "Override application display adjustments while launching activity" into rvc-dev am: 1421b3dace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716091

Change-Id: I81195b7c5e33160659704d7b7dcf27c203ce7f4c
 2020-06-04 06:29:08 +00:00