Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
558,629 Commits 3 Branches 0 Tags
f297e4494a3a67bd41796f35cfbf5f89d57c4936
Commit Graph

558629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
f297e4494a Merge "resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp 2020-10-30 20:39:32 +00:00
Shuo Qian
18a450a92b Merge "Try to add AppOps Keys into Proto to unblock my project" into rvc-qpr-dev-plus-aosp 2020-10-30 20:21:14 +00:00
Anton Hansson
024ea641db resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp 
Bug: 171029603
Test: No
Change-Id: I94146ebaf21cabd54105059fee3f07ba4043aa76
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
 2020-10-30 17:02:14 +00:00
Anton Hansson
887f4fbc74 Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 am: d6987e84d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480537

Change-Id: I9aafe5b87236abfbe019f6297dcb31a7cc900957
 2020-10-30 16:11:57 +00:00
Anton Hansson
d6987e84d5 Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480537

Change-Id: I636de254b4d7dd9c8f7ffe4cb55a12ada1fcf53b
 2020-10-30 15:53:29 +00:00
TreeHugger Robot
ec0c0bde4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2270f05e08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82082b4417fff0cf0ea5ff041a3f802eef29993e
 2020-10-30 15:52:30 +00:00
Anton Hansson
ad2bb796b0 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 15:22:45 +00:00
TreeHugger Robot
2270f05e08 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-10-30 15:21:21 +00:00
Corina
6bd2fd910b DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. am: 39150a7422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948761

Change-Id: If953e3fd513d43696fd4e3763ee78634ef71751e
 2020-10-30 13:19:49 +00:00
Corina
39150a7422 DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. 
Added TODO to enable this based on MediaProvider version (it needs a
media provider version which includes as certain change.)

Bug: 171491982
Test: No
Change-Id: I717251f351a65255ff73bf782e4f2fce3a67328f
 2020-10-30 13:00:13 +00:00
Treehugger Robot
c59b775963 Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b am: adfd73bd18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: Ib457623c1d204f8b83918a13c662335b4b9aded0
 2020-10-30 11:25:49 +00:00
Treehugger Robot
adfd73bd18 Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I3663ea2b95ec7815e84fa0729c39591280a90847
 2020-10-30 11:15:15 +00:00
Bill Yi
9fb898e15b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I19ec607aea18666102620348ac4919dd3b6ae0be
 2020-10-30 03:43:40 -07:00
Treehugger Robot
0e2959a56b Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I1a3b685f04d7b4d7d5a028015e94742c83db2dc8
 2020-10-30 10:37:17 +00:00
Treehugger Robot
a13966feea Merge "NetworkNotificationManager gets NotificationManager locally" 2020-10-30 10:21:29 +00:00
Treehugger Robot
4a418518e7 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours am: fe6fd2ea77 -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: Ibba9eafcf65c50cfe52b9d42f6b6d77d67ca886c
 2020-10-30 10:04:43 +00:00
Treehugger Robot
853858890b Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: Ia64761f215a5b353ff961d234994d613412d5d0d
 2020-10-30 10:04:13 +00:00
Anton Hansson
1befdc9e4f Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 am: 0a111c1280 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: Iaaf18128d1c26b928ca4d0cfdfa470c226887ebe
 2020-10-30 10:03:17 +00:00
Treehugger Robot
fe6fd2ea77 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I509d8b350d9fea9757a0740704e401d39ab7f1de
 2020-10-30 09:43:18 +00:00
Treehugger Robot
9149eab591 Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: I141384774f55dec9cf72ebc3fd4710766999d4d5
 2020-10-30 09:42:54 +00:00
Anton Hansson
0a111c1280 Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I28c6d399d82936bdedee7a0ccaef009a40fd0b13
 2020-10-30 09:42:17 +00:00
Treehugger Robot
b357c138f5 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I47de082b8e60278e8baa8381a384001d636e6f90
 2020-10-30 09:13:35 +00:00
Treehugger Robot
2635bb28b4 Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: I2815b83b72268d53b057f072d447b6688bb7d77e
 2020-10-30 09:10:59 +00:00
Anton Hansson
0a354a95f4 Merge "Remove the module-lib-api target" am: 36bd16e5ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I62b2f05995db0f8413c0a79b09e489c61f0007a2
 2020-10-30 09:06:43 +00:00
Treehugger Robot
c8769826af Merge "Restructure Module code [ com.android.tethering ]" 2020-10-30 08:41:36 +00:00
Treehugger Robot
f86cf6fb6c Merge "cleanup the isUpdatedSystemApp" 2020-10-30 08:38:43 +00:00
Anton Hansson
36bd16e5ab Merge "Remove the module-lib-api target" 2020-10-30 08:25:39 +00:00
Yo Chiang
7d1a821d9d Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd am: f785394fb3 am: b8f884150d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: I80dad6f69ae2305b15ffff3cf0ce078cbca592bd
 2020-10-30 07:55:18 +00:00
Yo Chiang
b8f884150d Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd am: f785394fb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: Ie3cccfbeb1d4d187bcf2282fe0fcdbcbc22ca261
 2020-10-30 07:44:22 +00:00
Sarah Chin
519153d67a Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e am: 4f26bb37a1 am: af8cf941d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480313

Change-Id: Id8f04880d5df090f7f20cb5de6951f0d3a0d6954
 2020-10-30 07:35:25 +00:00
Yo Chiang
f785394fb3 Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: I4bb7d89b9e6074e53c99b8e3cc6cc167a6b10add
 2020-10-30 07:14:25 +00:00
Sarah Chin
af8cf941d6 Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e am: 4f26bb37a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480313

Change-Id: Ia029e6aa7937789b13266ccede77741470ae0822
 2020-10-30 07:03:21 +00:00
Yo Chiang
0b6bf88ccd Merge "Disable DSU in executeRebootToNormalCommand()" 2020-10-30 06:55:43 +00:00
Sarah Chin
4f26bb37a1 Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480313

Change-Id: Ia1182d10a2d23a59cb3b576bccdb14860216f561
 2020-10-30 06:38:14 +00:00
Sarah Chin
a49fb9831e Merge "Update NETWORK_TYPE_NR docs" 2020-10-30 06:25:14 +00:00
Baligh Uddin
aaea97b6f3 Restructure Module code [ com.android.tethering ] 
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering

BUG: 167962976
Test: m com.android.tethering + TH
Merged-In: Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7
Change-Id: Ifae56d991b43c02f1e3496abbafc87d1869add8a
 2020-10-30 05:44:59 +00:00
Baligh Uddin
079fa94cd3 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours am: 4d2535e05d -s ours 
am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 adea79f7c8 is in history

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

Change-Id: I94b96c2777c28841a464808fb5bc44a5efe89a5d
 2020-10-30 05:39:31 +00:00
Baligh Uddin
4d2535e05d [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours 
am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 adea79f7c8 is in history

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

Change-Id: I0bed410286e6a199774856e053f41a7872079fac
 2020-10-30 05:14:12 +00:00
TreeHugger Robot
f7527ca970 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours am: 91b26f8f83 -s ours am: 34407ea59b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ceb6f769aeace07b3c4c05f08207f46d2184c39
 2020-10-30 05:04:27 +00:00
TreeHugger Robot
54ed79dc3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours am: 91b26f8f83 -s ours am: 937b4e5ce9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dfca2043322733c74dbd17bf35723327b00181b
 2020-10-30 04:58:44 +00:00
Baligh Uddin
7ba7715c73 Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master 2020-10-30 04:54:12 +00:00
TreeHugger Robot
34407ea59b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours am: 91b26f8f83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie20874dedd09cb66594fe46334dadf9e344bf1a2
 2020-10-30 04:52:18 +00:00
TreeHugger Robot
937b4e5ce9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours am: 91b26f8f83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I059f5795f2e7d0415751983e02971d4f4e1bcd06
 2020-10-30 04:51:53 +00:00
Paul Hu
070bbe9823 Merge "Replace NotificationManager @hide APIs" am: ff4b8b180c am: 6ae7712499 am: 2eb8179219 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452435

Change-Id: I41c548b42717f65e0e2421f1ad72e027408aa7ce
 2020-10-30 04:51:53 +00:00
Paul Hu
2eb8179219 Merge "Replace NotificationManager @hide APIs" am: ff4b8b180c am: 6ae7712499 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452435

Change-Id: I89085c9a06abd61d987659f7283f8dfdc7718c3a
 2020-10-30 04:40:38 +00:00
TreeHugger Robot
91b26f8f83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55f360380591e36c65d1cea7986b2abe5a55efc4
 2020-10-30 04:40:26 +00:00
TreeHugger Robot
1fcc7833e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-30 04:11:37 +00:00
Paul Hu
6ae7712499 Merge "Replace NotificationManager @hide APIs" am: ff4b8b180c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452435

Change-Id: I58d1c42c112855e43df6d6af4cd6e10373cff2bb
 2020-10-30 04:00:36 +00:00
Sarah Chin
55af3f191a Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0f3 am: 8787e9f3f0 am: be7ea71032 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480311

Change-Id: Id00c3871407a1c65e720a35738ffb5c899f10d1b
 2020-10-30 03:48:13 +00:00
Automerger Merge Worker
6d87612eea Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea82d90e45 -s ours am: ddf6d2b666 -s ours" into rvc-d1-dev-plus-aosp am: 39779af8fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1eac14386224c6210d74d13c70c70adb992ed78
 2020-10-30 03:47:47 +00:00