Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
492,997 Commits 3 Branches 0 Tags
10d116d1ecf9b73dee90a75fcfb09927d262f5d0
Commit Graph

492997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
10d116d1ec Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: I17cb9dc98f6b8299871a82bd29be8bdf78effbfc
 2020-07-16 16:55:57 +00:00
Makoto Onuki
2f20e9afe7 Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: Ib2e7f6b0575ee13fc1c341f1fb566e60920a621e
 2020-07-16 16:37:48 +00:00
Makoto Onuki
def1e68ead Merge "Merge module-lib-api-stubs-docs and -non-updatable" 2020-07-16 16:12:52 +00:00
Makoto Onuki
8c61de6ddf Merge module-lib-api-stubs-docs and -non-updatable 
Test: build / treehugger
Bug: 146727827
Merged-in: I9e8038b3899270ada12ed4cc057aeace2a36902d
Change-Id: I9e8038b3899270ada12ed4cc057aeace2a36902d
 2020-07-16 15:12:05 +00:00
Treehugger Robot
b803e8bf8d Merge "Fully remove startPacSystem() and stopPacSystem()" am: c7b4009f3e am: a93a01f9eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229603

Change-Id: Ib737ebd197e06ea673522bcc31cc37e9dcf05a31
 2020-07-16 13:58:59 +00:00
Treehugger Robot
a93a01f9eb Merge "Fully remove startPacSystem() and stopPacSystem()" am: c7b4009f3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229603

Change-Id: Ia0efed98d7e673259e2d16fa497ce9652be477b1
 2020-07-16 13:45:53 +00:00
Treehugger Robot
c7b4009f3e Merge "Fully remove startPacSystem() and stopPacSystem()" 2020-07-16 13:29:42 +00:00
Treehugger Robot
2c50b0efd7 Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 88f47d4d32 am: 416911a122 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497

Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
 2020-07-16 12:09:04 +00:00
Treehugger Robot
416911a122 Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 88f47d4d32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497

Change-Id: I74242ad8ffae7aa7bcf0562eee577d7f66747f09
 2020-07-16 11:57:03 +00:00
Treehugger Robot
88f47d4d32 Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" 2020-07-16 11:43:51 +00:00
junyulai
20b027ed2b Attribute data usage to virtual RAT type for 5G non-standalone mode 
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
 2020-07-16 18:22:09 +08:00
Peter Wang
4c7b55f086 Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a am: 098fb8606a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082

Change-Id: Icca17231fe6b7386e18b9c44a22eebdca2336f24
 2020-07-16 09:34:33 +00:00
Peter Wang
098fb8606a Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082

Change-Id: I293a44af83a949ae26061d8eac0ee69955984395
 2020-07-16 09:15:30 +00:00
Peter Wang
65f6068c8a Merge "Add a null check for EuiccProfileInfo access rules at creation" 2020-07-16 09:01:52 +00:00
TreeHugger Robot
47b34e44c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93c52f2842c936c70844c0623c83ee9505059306
 2020-07-16 08:20:14 +00:00
TreeHugger Robot
345a4d331f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-16 08:03:36 +00:00
Mark Chien
7b26300c42 Merge "Add tethering privileged test" am: c6cab2d5e8 am: 54c4148f8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: Id673131e628856ea57475384160baeac5e10de1b
 2020-07-16 04:41:20 +00:00
Mark Chien
54c4148f8f Merge "Add tethering privileged test" am: c6cab2d5e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: I9a97578c15ee9122d1e9ef79f42fa059e4fcc7f4
 2020-07-16 04:28:42 +00:00
Mark Chien
c6cab2d5e8 Merge "Add tethering privileged test" 2020-07-16 04:12:58 +00:00
markchien
05071c1e13 Add tethering privileged test 
Create TetheringPrivilegedTests which have MAINLINE_NETWORK_STACK
permission, the test can perform various network-related operations
which need CAP_NET_RAW and CAP_NET_ADMIN capabilities.

Bug: 145490751
Test: make TetheringPrivilegedTests
Change-Id: Ic205e5183e066766377c63336d9c5171d4875c6a
 2020-07-16 04:12:01 +00:00
Heemin Seog
4083acb8ff Merge "Address lifecycle crash in car sysui" into rvc-dev am: c42d4b65c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12163205

Change-Id: I97234d1e503bcd822e8e614772d77306ae2066cf
 2020-07-16 01:53:49 +00:00
Bill Yi
382ce9d171 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I65034363b946809dd196673a05a17fbb72db9a5f
 2020-07-15 18:36:27 -07:00
Heemin Seog
c42d4b65c8 Merge "Address lifecycle crash in car sysui" into rvc-dev 2020-07-16 01:35:59 +00:00
Treehugger Robot
40b66a14d8 Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I07a163cbfaf5e76f94d758953fed8d48c6cc66d8
 2020-07-16 01:18:14 +00:00
Treehugger Robot
83b308025a Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I57410539f4d4e449e47bf8dade55de823bff3bc4
 2020-07-16 01:05:09 +00:00
TreeHugger Robot
34d15e35a4 Merge "Updated docs for Autofill inline Session/controller." into rvc-dev am: 0b649ebc96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12142906

Change-Id: Id584cb07e2e98b1d2e1893d0663f6584ba3f1917
 2020-07-16 00:51:11 +00:00
Treehugger Robot
6478559721 Merge "Show subId info for getMessagesFromIntent log if it available only" 2020-07-16 00:49:12 +00:00
TreeHugger Robot
0b649ebc96 Merge "Updated docs for Autofill inline Session/controller." into rvc-dev 2020-07-16 00:35:08 +00:00
Peter Wang
548f34b47d Add a null check for EuiccProfileInfo access rules at creation 
Bug: 158780604
Fix: 158780604
Test: Build
Change-Id: I6432499309115c7ca29f4704e0f5cfc871eb4d00
Merged-In: I6432499309115c7ca29f4704e0f5cfc871eb4d00
 2020-07-15 17:34:27 -07:00
TreeHugger Robot
699f5b0d50 Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

Change-Id: I2d692234b74c7662cdf79f8fc951ffc4fc58433d
 2020-07-15 23:18:12 +00:00
Soonil Nagarkar
5cda502532 DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

Change-Id: I03ea44566def9929889479a8ec9c31f9e6b63f84
 2020-07-15 23:18:03 +00:00
Heemin Seog
d79966114a Address lifecycle crash in car sysui 
We address this by removing the phone specific lifecycle view from car
sysui.

Bug: 161366224
Test: See bug for manual testing steps
Change-Id: I1309aa938f1bcc5c634a531a2eca3a45f1eb2946
 2020-07-15 16:09:58 -07:00
TreeHugger Robot
1b09322bc6 Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev 2020-07-15 23:05:42 +00:00
Songchun Fan
33c669f4f5 Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df53d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160605

Change-Id: I4268bc7a201e2eae6674f57ce772313cad8ef0a4
 2020-07-15 22:50:42 +00:00
Songchun Fan
37f00df53d Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev 2020-07-15 22:34:50 +00:00
Songchun Fan
8a40728f6d [pm] make sure to restore mAlways=true preferred activity filter 
Test: manual and verified that if a action has more than one preferred
activity filters, at least the mAlways=true filter will be restored on reboot.

Test: Before reboot in dumpsys:
      android.media.action.STILL_IMAGE_CAMERA:
        59144b6 com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=false
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"
        7d0bd59 com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=false
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"
        fbb913d com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=false
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"
        c86d195 com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=true
          Selected from:
            com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
            photo.android.hd.camera/com.android.camera.activity.SplashActivity
            filter.camera.snap.photo.video.panorama/cn.kuxun.kxcamera.CameraActivity
            net.sourceforge.opencamera/.MainActivity
            com.snapchat.android/com.snap.mushroom.MainActivity
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"

Test: After reboot in dumpsys:
      android.media.action.STILL_IMAGE_CAMERA:
        aaf8ce5 com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=false
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"
        c249186 com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
         mMatch=0x100000 mAlways=true
          Selected from:
            com.google.android.GoogleCamera/com.android.camera.CameraImageActivity
            photo.android.hd.camera/com.android.camera.activity.SplashActivity
            filter.camera.snap.photo.video.panorama/cn.kuxun.kxcamera.CameraActivity
            net.sourceforge.opencamera/.MainActivity
            com.snapchat.android/com.snap.mushroom.MainActivity
          Action: "android.media.action.STILL_IMAGE_CAMERA"
          Category: "android.intent.category.DEFAULT"

BUG: 157548344
Change-Id: I4b6c23e25957138a0b38f4be074c24a4519df59f
 2020-07-15 13:51:40 -07:00
Soonil Nagarkar
d9df33d1c0 DO NOT MERGE: Always return non null from getGpsStatus 
Even though getGpsStatus is marked Nullable, some applications expect it
to always return non-null.

Bug: 161311411
Test: presubmits
Change-Id: I8d58621588253af1dc917711e230cfd176afec37
 2020-07-15 13:12:54 -07:00
Lucas Dupin
0d050d0f5d Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp 2020-07-15 20:02:03 +00:00
Evan Rosky
2364eaf2e6 Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621

Change-Id: I70569d18a8a826b9dfed0afa7ec7a6ff624bdbb6
 2020-07-15 19:35:17 +00:00
Evan Rosky
6a630f3994 Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev 2020-07-15 19:14:48 +00:00
TreeHugger Robot
ba382230d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9770b57df7f3905a0fd359e09081ed6dd24da81e
 2020-07-15 16:49:10 +00:00
Songchun Fan
6618aa74a7 Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev am: 9093346b9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12141813

Change-Id: I7c7fec04934ff6f4773d71673b7e10f43067787a
 2020-07-15 16:48:42 +00:00
TreeHugger Robot
218b61acf4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-15 16:46:17 +00:00
Songchun Fan
9093346b9e Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev 2020-07-15 16:27:39 +00:00
Makoto Onuki
a553a497fd Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d am: 1e085a1db4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: Ie45f32b2d46c8ac989a4a9242017eb4c2b73484b
 2020-07-15 16:00:22 +00:00
Makoto Onuki
1e085a1db4 Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: I17d06553e949a9f092bad513ec9880b05d1b38e9
 2020-07-15 15:43:34 +00:00
Makoto Onuki
06b1ba180d Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" 2020-07-15 15:26:06 +00:00
Wale Ogunwale
2346053033 Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12157384

Change-Id: I82021bdc4f4d737feda4a20febf532db9fa1c850
 2020-07-15 14:03:48 +00:00
Wale Ogunwale
0b237bb06f Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev 2020-07-15 13:53:20 +00:00
Taras Antoshchuk
e7b15792ec Use clean calling identity to clear preferred activities am: 089b0bb4f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12149990

Change-Id: If8219cd2f2263a7319be3693252f4557e81d2c2d
 2020-07-15 13:31:38 +00:00