Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
38e01b3d3a Merge changes from topic "am-47da99b99c4047c98fbfc33f939b5089" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: 699f5b0d50
  DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: 5cda502532
 2020-07-15 23:36:30 +00:00
TreeHugger Robot
9b1cd0daec Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: 699f5b0d50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

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

Change-Id: I5d9ee564e36b358ba76d29d251bc7b74d1e294ae
 2020-07-15 23:36:09 +00:00
TreeHugger Robot
d69ac21c67 Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: bb8541322e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

Change-Id: If7e2aadbaa0c69f84f2db885b9ccbf3a898150c6
 2020-07-15 23:36:07 +00:00
Soonil Nagarkar
8f581abc1c DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: e2c8878455 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606

Change-Id: Id902f43f219ecc94fa054db611914f6ddc5b225f
 2020-07-15 23:35:54 +00: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
TreeHugger Robot
bb8541322e 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: I48d10030609ee19d2763d5382c62e4c260b15a7d
 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
Soonil Nagarkar
e2c8878455 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: I3aba2bac88989f04658c4409d6491c7e23b917f5
 2020-07-15 23:18:02 +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
Songchun Fan
b8f4e68507 Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df53d am: 33c669f4f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160605

Change-Id: Ib7378cafa08abf5b0c3af78e3bffa956d2e7e21c
 2020-07-15 23:06:34 +00:00
Songchun Fan
881eeb89ac Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev am: 37f00df53d am: f049d21860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160605

Change-Id: Ic16d8d29ff793bcdf7509f55e7fd3f9986d21536
 2020-07-15 23:05:55 +00: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
f049d21860 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: Id6d88306e545bb1f9327ad937eb12443101652e8
 2020-07-15 22:50:41 +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
f7548e26e1 Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp am: 0d050d0f5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154028

Change-Id: I4cd331da42711bc5f45ea021e87ab42f8f540923
 2020-07-15 20:06:42 +00:00
Lucas Dupin
c95406fce1 DO NOT MERGE Fix broken test am: c8daad6962 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154028

Change-Id: I3ffa5f34495c0a3ac818d41a45ac29936d6f1bc5
 2020-07-15 20:06:31 +00:00
Lucas Dupin
0d050d0f5d Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp 2020-07-15 20:02:03 +00:00
Automerger Merge Worker
3b3345bac3 Merge "Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: 2364eaf2e6" into rvc-d1-dev-plus-aosp 2020-07-15 19:56:58 +00:00
Evan Rosky
3db3bae57a Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: 2364eaf2e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621

Change-Id: Iecda3cc9a5bac3b2d0577e613d4765ab912f2601
 2020-07-15 19:56:52 +00:00
Evan Rosky
9addc13d96 Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: a957ca5bfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621

Change-Id: I07fa9412046ea05d4860da92414287438921b24a
 2020-07-15 19:56:27 +00:00
Evan Rosky
a957ca5bfd 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: Idc8f7cb19d3ee6efc688747d974aeaa58c4b3ed7
 2020-07-15 19:35:43 +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
4d745b86a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: ba382230d9 -s ours 
am skip reason: subject contains skip directive

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

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

Change-Id: I399288e8690159a334d57e4d58cd752ab8fed1f0
 2020-07-15 17:09:26 +00:00
TreeHugger Robot
505574f6ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 218b61acf4 -s ours am: 7b142fb0e4 -s ours 
am skip reason: subject contains skip directive

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

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

Change-Id: Ifa6dffdadf72606c6ca4d4df0a755e8aaa61ad18
 2020-07-15 16:54:18 +00:00
TreeHugger Robot
d00097533f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: e23bf50171 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5ba8a892eb82f6fe0b43cbe54d5e1ee92a7bb2
 2020-07-15 16:53:51 +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
TreeHugger Robot
7b142fb0e4 [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: Id5e6cc738cd86c61063cfee7e57ad063c57bab84
 2020-07-15 16:48:59 +00:00
Songchun Fan
4d7ce77709 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: I9ade88f979ccd800da6b9685757ea5daa8f0b4b7
 2020-07-15 16:48:48 +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
TreeHugger Robot
e23bf50171 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-15 16:38:14 +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
42337f43f0 Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d am: 1e085a1db4 am: a553a497fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: I3362be72460c8830569b7dda470d581b176ea28a
 2020-07-15 16:15:25 +00:00
Beverly
ea6358468c Give SysUi top-app while playing charging anim am: c4b0c2c602 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12142930

Change-Id: Iab40a4e6064b10fb94d860117a5e7f3930e82960
 2020-07-15 16:09:37 +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
Rubin Xu
ac51bf8a40 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain 
This change includes the following commits that are related to
CertInstaller and KeyChain:

7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
 2020-07-15 15:50:14 +01:00
Beverly
c4b0c2c602 Give SysUi top-app while playing charging anim 
So that if the device is performing multiple tasks, the charging
animation will be given priority and won't be janky.

Test: manual
Bug: 158678428
Change-Id: I02e31bdac3b46093a76e95e62f2abf4ee47cbb27
 2020-07-15 14:34:05 +00:00
Automerger Merge Worker
156b539a0a Merge "Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f am: 1813474cc9" into rvc-d1-dev-plus-aosp 2020-07-15 14:19:55 +00:00
Wale Ogunwale
2cff1f32fc Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f am: 2346053033 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12157384

Change-Id: I13f507d5693fdac232c8b6b29dda775358a90658
 2020-07-15 14:19:44 +00:00