Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
656,850 Commits 3 Branches 0 Tags
ccb4fc52aa5c95819e6c2a31071f777d0b2b8f4d
Commit Graph

656850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yi Kong
ccb4fc52aa Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6b1 am: 712e696cb4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884169

Change-Id: I34e9294e55a09d33e2bd97c3bd99b2dc1a2da5b2
 2021-11-08 11:42:52 +00:00
Yi Kong
712e696cb4 Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884169

Change-Id: I8fd5520e27ed54997f607b8145ceda7409e12148
 2021-11-08 11:24:43 +00:00
Yi Kong
473d29e6b1 Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" 2021-11-08 11:11:07 +00:00
Wei Sheng Shih
b87acfcfde Merge "setTurnScreenOn can only used as wakeup" am: 385935d07f am: a833f2152a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884170

Change-Id: I812de347deb83ced762560260b62544c924b7056
 2021-11-08 07:44:40 +00:00
Wei Sheng Shih
a833f2152a Merge "setTurnScreenOn can only used as wakeup" am: 385935d07f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884170

Change-Id: I330aebdfde7eaf349aaf4c4c6ee8adb0be50e212
 2021-11-08 07:25:29 +00:00
Wei Sheng Shih
385935d07f Merge "setTurnScreenOn can only used as wakeup" 2021-11-08 07:07:27 +00:00
Yi Kong
b324a7418a Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD 
The new name better aligns with the component and permission names.

Follow up review comments on https://r.android.com/1784487

Bug: 183487233
Test: presubmit
Change-Id: Ibe3a3e51b0dc154ee3e43b27e561fd541b62cc54
 2021-11-08 06:16:22 +00:00
wilsonshih
5ffa690f0c setTurnScreenOn can only used as wakeup 
setTurnScreenOn shouldn't dismiss keyguard automatically even when the
keyguard is insecure.
The keyguard state should only be affected by requestDismissKeyguard
and/or setShowWhenLocked, and for either case setTurnScreenOn can be
used to wakeup device if the activity is going to be resumed and
visible.

Bug: 201103497
Test: atest ActivityVisibilityTests KeyguardTests KeyguardLockedTests
Change-Id: I283dea469a33286fc9cf835e39ee5a3be2444739
 2021-11-08 11:04:10 +08:00
Yi Kong
3e6258066e Merge "profcollect/betterbug integration with content uri" am: 0849b35051 am: 282fa75f5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784487

Change-Id: I97977f160adf82834d647650f8318c5c77eaa4d9
 2021-11-06 08:48:29 +00:00
Yi Kong
282fa75f5e Merge "profcollect/betterbug integration with content uri" am: 0849b35051 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784487

Change-Id: Ie21d1720c0bd88f9a50cab8031318c9f6aff5984
 2021-11-06 08:31:01 +00:00
Yi Kong
0849b35051 Merge "profcollect/betterbug integration with content uri" 2021-11-06 08:17:18 +00:00
Treehugger Robot
026856ae7a Merge "Refactored DataProfile and ApnSetting" am: bcafa9a7b1 am: 0ffc04a539 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883556

Change-Id: Ie4c263d4de5041028465931bc04d9b420ea890c9
 2021-11-06 06:01:22 +00:00
Treehugger Robot
0ffc04a539 Merge "Refactored DataProfile and ApnSetting" am: bcafa9a7b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883556

Change-Id: I2d946ddbadb8f6e5ad6722c185e517c7a5e7c4c4
 2021-11-06 05:44:56 +00:00
Treehugger Robot
bcafa9a7b1 Merge "Refactored DataProfile and ApnSetting" 2021-11-06 05:22:17 +00:00
Les Lee
10f7bb62c5 Merge "Fix normalize doesn't work on carrier template" am: a1e47b652b am: a42b6bffbb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878227

Change-Id: Icc28a06c508147e089f1f43e5cb163921fa96be4
 2021-11-06 01:30:15 +00:00
Les Lee
a42b6bffbb Merge "Fix normalize doesn't work on carrier template" am: a1e47b652b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878227

Change-Id: I955970137e916ab402c3a81a6656a22cc5c45c99
 2021-11-06 01:11:32 +00:00
Les Lee
a1e47b652b Merge "Fix normalize doesn't work on carrier template" 2021-11-06 00:54:14 +00:00
Nathan Harold
1f5211ff51 Merge "Add GERAN to Docstring for PhysicalChannelConfig" am: 9aca73a930 am: 83da6cfd93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1879179

Change-Id: I640d2296893441433d2c87c9379712044392c9f4
 2021-11-06 00:17:49 +00:00
Jack Yu
fc2b851d9d Refactored DataProfile and ApnSetting 
Merged traffic descriptor into DataProfile. Now DataProfile
becomes a container of an ApnSetting plus a TrafficDescriptor.

Bug: 196597630
Test: CTS && atest FrameworksTelephonyTests
Merged-In: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
Change-Id: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
(cherry picked from commit bbb1110998)
 2021-11-05 17:16:13 -07:00
Nathan Harold
83da6cfd93 Merge "Add GERAN to Docstring for PhysicalChannelConfig" am: 9aca73a930 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1879179

Change-Id: I84091b567e812e95a7859e9683cee9302b2df932
 2021-11-06 00:04:28 +00:00
Nathan Harold
9aca73a930 Merge "Add GERAN to Docstring for PhysicalChannelConfig" 2021-11-05 23:49:40 +00:00
Treehugger Robot
fd6db31dc1 Merge "Add the min aspect ratio to ActivityRecordProto and populate it" am: 99da93a0e7 am: 60a7d7596e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882061

Change-Id: Id833477a6dfee0162a15c85d6ed3ea08e66a29fe
 2021-11-05 18:45:16 +00:00
Treehugger Robot
60a7d7596e Merge "Add the min aspect ratio to ActivityRecordProto and populate it" am: 99da93a0e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882061

Change-Id: Ifc8b9452d03723cb7739a0588b5e9697f3db9ec4
 2021-11-05 18:27:01 +00:00
Bernardo Rufino
f509e2d9b7 Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()" am: f5cc73d25f am: adcfd2f940 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878339

Change-Id: I4ad57b6ecef824d35283a176918cad5d3c1819d6
 2021-11-05 18:11:34 +00:00
Roopa Sattiraju
27d3253e54 Merge "Change getEnabledComponentOverrides return type" am: 30cd5df67f am: 3374e0478a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853043

Change-Id: I71b81a22256648e7f7cb38e11d54608f6ff534d5
 2021-11-05 18:11:16 +00:00
Treehugger Robot
99da93a0e7 Merge "Add the min aspect ratio to ActivityRecordProto and populate it" 2021-11-05 18:06:29 +00:00
Bernardo Rufino
adcfd2f940 Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()" am: f5cc73d25f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878339

Change-Id: I43dff41f44fb904c6c4d44b870c9de88945f04f3
 2021-11-05 17:54:15 +00:00
Roopa Sattiraju
3374e0478a Merge "Change getEnabledComponentOverrides return type" am: 30cd5df67f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853043

Change-Id: I5e574a96ed621ced895322aa8c762e4b08a68b44
 2021-11-05 17:53:40 +00:00
Bernardo Rufino
f5cc73d25f Merge "Refactor Bundle for thread-safety of Bundle.hasFileDescriptors()" 2021-11-05 17:43:00 +00:00
Roopa Sattiraju
30cd5df67f Merge "Change getEnabledComponentOverrides return type" 2021-11-05 17:33:00 +00:00
Trevor Radcliffe
21587435c7 Merge "Migrate rs/jni to Soong" am: eaebd2cd54 am: a6f5cf56e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1865054

Change-Id: I75bd578e44d1962d1cf78e2f9ab8396c0ad6b2fa
 2021-11-05 16:49:23 +00:00
Trevor Radcliffe
a6f5cf56e8 Merge "Migrate rs/jni to Soong" am: eaebd2cd54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1865054

Change-Id: I33472acbe1c0d3649edcde34c6c128f0b0397eb9
 2021-11-05 16:33:11 +00:00
Trevor Radcliffe
eaebd2cd54 Merge "Migrate rs/jni to Soong" 2021-11-05 16:10:56 +00:00
Bernardo Rufino
c823dcac51 Merge "Improve @hide Parcel.hasFileDescriptors(Object)" am: 41d4be0fef am: e927d812de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878338

Change-Id: I13976db7da3f112ffc1c945405a89f81bff311c6
 2021-11-05 15:23:15 +00:00
Bernardo Rufino
e927d812de Merge "Improve @hide Parcel.hasFileDescriptors(Object)" am: 41d4be0fef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878338

Change-Id: I0543b041aca75795d2e79ee85f31def4811908b7
 2021-11-05 15:04:14 +00:00
Bernardo Rufino
41d4be0fef Merge "Improve @hide Parcel.hasFileDescriptors(Object)" 2021-11-05 14:51:18 +00:00
Vadim Caen
2a1b040eae Merge "Add details about theme stability" into sc-dev am: 9aff8397c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16176790

Change-Id: I3d37f3c0551a178a5018c143fa7ca22dc4bfa45a
 2021-11-05 12:12:10 +00:00
Vadim Caen
9aff8397c8 Merge "Add details about theme stability" into sc-dev 2021-11-05 11:57:16 +00:00
tomnatan
61836d5b5a Add the min aspect ratio to ActivityRecordProto and populate it 
This is needed for CompatChangeTests to verify that the min aspect ratio
is applied directly by checking the min aspect ratio.

Bug: 203541827
Test: N/A
Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
 2021-11-05 11:29:51 +00:00
Rahul Sabnis
c59fe0168f Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." am: eb806924d6 am: f9960bd169 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858070

Change-Id: I1ff340189123f7a9e5e292c6062f17e42059e94b
 2021-11-05 05:39:30 +00:00
Rahul Sabnis
f9960bd169 Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." am: eb806924d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858070

Change-Id: I37032a518f4310d16ad19279265b91ab610bed18
 2021-11-05 05:28:28 +00:00
Rahul Sabnis
eb806924d6 Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." 2021-11-05 05:13:01 +00:00
Rahul Sabnis
8e78d9fbf3 Deprecate GATT callbacks and methods that were not memory safe and 
replace with memory safe versions.

Tag: #feature
Bug: 195157393
Test: Manual
CTS-Coverage-Bug: 205190062
Merged-In: I5ae604ec20febcf646bfe6a8f866b218448349c1
Change-Id: I5ae604ec20febcf646bfe6a8f866b218448349c1
 2021-11-05 03:30:03 +00:00
Nathan Harold
b175697953 Add GERAN to Docstring for PhysicalChannelConfig 
Bug: 8675309
Test: none (docstring-only-change)
Change-Id: I2d96980b1d2fcc665b63d126ae2ebb63e649a574
 2021-11-05 02:06:24 +00:00
TreeHugger Robot
89435a9823 [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours am: 5637b4df4a -s ours am: ebfb03ea7a -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: I3341b0567d4f55359e4aa0726c4ef475d7dc0f5c
 2021-11-04 20:04:27 +00:00
TreeHugger Robot
90976dc462 [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours am: fe0dd0153e -s ours am: bc21b57873 -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: Ic3aa91a343201d542fbe40d0a9bce0e6ea0c1705
 2021-11-04 20:04:14 +00:00
TreeHugger Robot
ebfb03ea7a [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours am: 5637b4df4a -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: I9411fb56b542626078a5f8f852d538cd92068468
 2021-11-04 19:59:05 +00:00
TreeHugger Robot
bc21b57873 [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours am: fe0dd0153e -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: If7dbbe3feb5a1c859397113f5df58bfcc0b3120a
 2021-11-04 19:50:04 +00:00
TreeHugger Robot
5637b4df4a [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: Ib61cc914f72cd3439a8bf703962bef136de132be
 2021-11-04 19:38:53 +00:00
TreeHugger Robot
fe0dd0153e [automerger skipped] Merge "Allow forcing status bar state changes and do so when the screen turns off." into qt-qpr1-dev am: cc70d98ee4 -s ours am: 200306a728 -s ours 
am skip reason: Merged-In I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3 with SHA-1 921d955822 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16192213

Change-Id: Iff9eb6132ea263ee7e82faad339566df9dadb85e
 2021-11-04 19:38:03 +00:00