Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
032022c6c2 Merge "Fix UCE docs" am: 5c91f871d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344878

Change-Id: Ic4ee7aaad2e9f4f1ea763d25008ed375edb43359
 2020-06-19 18:37:23 +00:00
Govinda Wasserman
9fa201e0a4 Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643

Change-Id: Ifd61f0f66b2f33de2782eeec9817f26e2e1a6255
 2020-06-19 18:37:22 +00:00
Pinyao Ting
4ddd778d0e Fix the exception when shortcut info was removed before loading 
persisted bubbles

Bug: 159243080
Test: manual
Change-Id: Ie3211ae97de1ed146a639424ffbc7f19bd496c8e
 2020-06-19 11:37:08 -07:00
Khaled Abdelmohsen
592da34c0b Merge "Modify source stamp format" into rvc-dev 2020-06-19 18:36:27 +00:00
Ben Lin
e3f7c5d5f5 Merge "Disable drag handle." into rvc-dev am: 79554c081d am: a4c6c33df2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128

Change-Id: Ifdb6b9b1dbc1ca3883a7efe036ac8c75e14839b9
 2020-06-19 18:31:51 +00:00
Govinda Wasserman
c7f7f57bb9 Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 47266510d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643

Change-Id: Ib6de1eb32e2c984bd7f3fe2ac234201d4163d5a4
 2020-06-19 18:31:37 +00:00
Ben Lin
c444d8f8ad Merge "Disable drag handle." into rvc-dev am: 79554c081d am: 80d9344e16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128

Change-Id: Ib53d6f176d132e5ccc3cf13bf7d1499f5483ffa0
 2020-06-19 18:31:29 +00:00
Miranda Kephart
7945165934 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 5e93c737e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617

Change-Id: I5d146b4d5bcadd978fca4190dcef2505a015db35
 2020-06-19 18:31:18 +00:00
Govinda Wasserman
47266510d1 Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643

Change-Id: I05e747501c90af34613c872b847b2f62cdf526db
 2020-06-19 18:31:09 +00:00
Automerger Merge Worker
6aeba0e43d Merge "Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 8d692863f6" into rvc-d1-dev-plus-aosp 2020-06-19 18:31:06 +00:00
Miranda Kephart
ba2b609737 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 8d692863f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617

Change-Id: I66d1561a24822e50f67d017a1d7806eaee610755
 2020-06-19 18:30:58 +00:00
TreeHugger Robot
cfbac9d5d3 Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 71c03aa64d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: I3e2a529f6b2aeaae09182acb29ef46f0aaeb006d
 2020-06-19 18:30:52 +00:00
Hai Shalom
21f67c5fb0 [WifiEnterpriseConfig] Update javadoc for setCaCert/Path 
Update javadoc for WifiEnterpriseConfig#setCaCert, setCaCerts and
setCaPath to document that if not set, then the server certificate
validation is skipped and the connection is not secure.

Bug: 159458442
Test: No code changes
Change-Id: Icb26b340f743faf129544a0d889dcb7bc1a76551
 2020-06-19 11:30:44 -07:00
Ben Lin
2e900db3e2 Merge "Disable drag handle." into rvc-dev am: 79554c081d am: a4c6c33df2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128

Change-Id: I93c29ba643a012432f5a4a7dee4d9475d439efee
 2020-06-19 18:30:42 +00:00
Govinda Wasserman
6650cd46aa Merge "Generify arguments to AssistLogger" into rvc-dev 2020-06-19 18:30:42 +00:00
Ben Lin
80d9344e16 Merge "Disable drag handle." into rvc-dev am: 79554c081d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128

Change-Id: Ieae009e42928e3d03416e2af888e1b2adc7a02d6
 2020-06-19 18:30:39 +00:00
Miranda Kephart
985d1a6b37 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 8d692863f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617

Change-Id: Ibb16fd46887bd395006fd4c647937eea4d7d6887
 2020-06-19 18:30:34 +00:00
Ben Lin
a4c6c33df2 Merge "Disable drag handle." into rvc-dev am: 79554c081d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128

Change-Id: I459098e94a0601ade33ec5d1d88fb070bba67f32
 2020-06-19 18:30:17 +00:00
TreeHugger Robot
7754e0a544 Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 6f3b411b21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: Ib5e230af952b8ba3f04df063b172fee8ed2e6121
 2020-06-19 18:30:15 +00:00
TreeHugger Robot
5ca8855b7c Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 6f3b411b21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: I6e2fb10f2986e86ccbdc1817496ab611742714bc
 2020-06-19 18:30:14 +00:00
Brad Ebinger
5c91f871d7 Merge "Fix UCE docs" 2020-06-19 18:27:56 +00:00
Ben Lin
79554c081d Merge "Disable drag handle." into rvc-dev 2020-06-19 18:27:02 +00:00
Automerger Merge Worker
91e60f70b1 Merge "Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: a457821085" into rvc-d1-dev-plus-aosp am: 516c22c8f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: I4840ed507b7aa28f2a5be76e988a38f6e3d4f36d
 2020-06-19 18:26:22 +00:00
Automerger Merge Worker
302a373b29 Merge "Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 am: bc2613fe88" into rvc-qpr-dev-plus-aosp 2020-06-19 18:25:56 +00:00
Nikolas Havrikov
18f1c524b8 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 am: 11334e7104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: I0902ac4b29c3962d22c3012cc8a9ab7ec5632b5b
 2020-06-19 18:25:42 +00:00
Nikolas Havrikov
9904c29c2e Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 am: bc2613fe88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Ieb545ead0f58eb2a9e43fbc1fb225bfb8e7fe22c
 2020-06-19 18:25:39 +00:00
Miranda Kephart
5e93c737e7 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617

Change-Id: Iec5731f087ab56fa8b854f133d0ca265074694ba
 2020-06-19 18:25:29 +00:00
Miranda Kephart
8d692863f6 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617

Change-Id: I00125bc08fef4a5f1da08b8ce8d16157dd538cce
 2020-06-19 18:25:26 +00:00
Miranda Kephart
703aaba6c6 Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev 2020-06-19 18:21:55 +00:00
TreeHugger Robot
6f3b411b21 Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: I01e38e4a2f4d6e006d625d838aad5a30615be59f
 2020-06-19 18:19:36 +00:00
TreeHugger Robot
71c03aa64d Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: I282b21687ac4c671d4b8a610da05115280d74905
 2020-06-19 18:19:25 +00:00
Automerger Merge Worker
516c22c8f2 Merge "Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: a457821085" into rvc-d1-dev-plus-aosp 2020-06-19 18:15:09 +00:00
Nikolas Havrikov
e0abc39542 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: a457821085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Ief629b3638939c5d6e7f6d0552666fd9d124b411
 2020-06-19 18:14:57 +00:00
Nikolas Havrikov
11334e7104 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Idc130a88857cb4332d2af1c401aeb0c63cb20f12
 2020-06-19 18:14:39 +00:00
Nikolas Havrikov
bc2613fe88 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: I693518ecda5af070d1f42a1ea1f2f0ed1af86e70
 2020-06-19 18:14:07 +00:00
Automerger Merge Worker
fb38121ff1 Merge "Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 177977cc41" into rvc-d1-dev-plus-aosp am: 505204e6ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I49319777ecc60b730c0c6cc731ca6168418227cf
 2020-06-19 18:09:15 +00:00
Ben Lin
1dd19054ab Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 8cff874ce8 am: dce2e09ef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I229a85d81b2664eb957c3cdf9ae74a7bcf28b56e
 2020-06-19 18:08:10 +00:00
Ben Lin
32019281c3 Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 8cff874ce8 am: 252446b9b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I978b2df6a6437d51bb71d3c2c014b664e046fbb5
 2020-06-19 18:08:02 +00:00
TreeHugger Robot
e9db363b54 Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev 2020-06-19 18:06:59 +00:00
Nikolas Havrikov
fb0af32188 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Idb452abc8f856280966d987029e7776ab89d3eb3
 2020-06-19 18:01:19 +00:00
Nikolas Havrikov
a457821085 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Id964f7b5ffed9c9836f8fd8db2d958f8ea9be582
 2020-06-19 18:01:06 +00:00
Brad Ebinger
3afcd20f6a Fix MmTelFeatureConnection Memory Leak 
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Fixes: 157948894
Test: atest FrameworksTelephonyTests
Merged-In: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
 2020-06-19 10:57:04 -07:00
Automerger Merge Worker
505204e6ae Merge "Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 177977cc41" into rvc-d1-dev-plus-aosp 2020-06-19 17:53:36 +00:00
Ben Lin
dce2e09ef3 Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 8cff874ce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I638482c67cb0c6b0af2d0172a038eed2c3921d04
 2020-06-19 17:53:31 +00:00
Ben Lin
1bf7076716 Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 177977cc41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I15f83c8146fd689ab403170883cc559586936c1a
 2020-06-19 17:53:23 +00:00
Ben Lin
252446b9b9 Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c3734 am: 8cff874ce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11845255

Change-Id: I54a8d38bfa3bd7591ca31c0b3c2a5f90a05e51b1
 2020-06-19 17:53:17 +00:00
Nikolas Havrikov
0cf1ad8495 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev 2020-06-19 17:49:34 +00:00
Michael Wachenschwanz
793da64d37 Move AppStandbyController calls out of UsageStats lock 
Move reportEvent, flushToDisk, and dumping out of the UsageStats lock.

Fixes: 158361735
Test: atest com.android.server.usage.AppStandbyControllerTests
Test: atest android.app.usage.UsageStatsTest
Test: manual ("adb shell dumpsys usagestats", with multiple users)
Change-Id: I9f5c2adcb3ef71e82b969b35e7129e715fbfa00d
 2020-06-19 10:44:49 -07:00
Evan Rosky
b623813592 Start dim animations on pending vs sync transaction 
We try to put animations on pending transaction to avoid
jank. In this case, it also avoids bad state (where a surface
is created/parented after its used for animation and
potentially cleaned-up).

Bug: 159336447
Test: enter split primary, in recents, take a screenshot and choose
      share, then expand the primary to leave split. Observe no
      lingering dim layer.
Change-Id: Ia1301a3b22c6eb07192c99b2bfd9aa60ed3c7e95
 2020-06-19 10:38:17 -07:00
Brad Ebinger
aa4d1c60a5 Fix UCE docs 
Clarify some of the docs for UCE Intent.

Fixes: 156114453
Fixes: 158014476
Test: docs only
Merged-In: I01617d0741055e347e05bdbd5eb5a6825f896e73
Change-Id: I01617d0741055e347e05bdbd5eb5a6825f896e73
 2020-06-19 10:32:59 -07:00