Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
517,330 Commits 3 Branches 0 Tags
02344ea8e541c3d1db4fe6b5f0e97e4c42b104c8
Commit Graph

517330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
02344ea8e5 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours am: 5fe9ba4dd8 -s ours" into rvc-d1-dev-plus-aosp am: 22d7a34d6b -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie190cb8a4e9b6546a250bc60e9f604867c970e59
 2020-05-04 01:08:49 +00:00
TreeHugger Robot
c0e3e23f6b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6afdcd113c -s ours am: f07aefe528 -s ours am: 163d53b5d8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I51d0d3b85fef97b3ecaa17ad3d1f8327715b0ec7
 2020-05-04 01:08:44 +00:00
TreeHugger Robot
635fbf0088 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours am: 22ece74639 -s ours am: 0bdc28bc00 -s ours 
am skip reason: subject contains skip directive

Change-Id: I79fa63d7a8effb11d507b1ef1c801bb29a716b93
 2020-05-04 01:08:32 +00:00
Automerger Merge Worker
22d7a34d6b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours am: 5fe9ba4dd8 -s ours" into rvc-d1-dev-plus-aosp 2020-05-04 00:57:26 +00:00
TreeHugger Robot
db1dbca34c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours am: 5fe9ba4dd8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1090ee41cd7294bdfc1e14d3a5ac75d4ba8e7717
 2020-05-04 00:56:30 +00:00
TreeHugger Robot
163d53b5d8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6afdcd113c -s ours am: f07aefe528 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icca141851cfa4555668420d35a8eeddef19fe4bb
 2020-05-04 00:56:24 +00:00
TreeHugger Robot
0bdc28bc00 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours am: 22ece74639 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic622d38cfbf292a2546ac389d9f8c9ea3df9b8ee
 2020-05-04 00:56:14 +00:00
TreeHugger Robot
f07aefe528 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6afdcd113c -s ours 
am skip reason: subject contains skip directive

Change-Id: I237350101f22dd8259034f6b423ac42ebe8e795c
 2020-05-04 00:45:10 +00:00
TreeHugger Robot
5fe9ba4dd8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours 
am skip reason: subject contains skip directive

Change-Id: I453d70724ba3445fd4b7bcd67fba7cbf3b2cfc49
 2020-05-04 00:45:02 +00:00
TreeHugger Robot
22ece74639 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a295106825 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4e0440577f0df435fe8bd05284f7ea6eecc133f6
 2020-05-04 00:44:42 +00:00
TreeHugger Robot
6afdcd113c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-04 00:40:37 +00:00
TreeHugger Robot
a295106825 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-04 00:32:52 +00:00
Jay Aliomer
b516e24e7b Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: db715d9dc1 am: d5956a11c3 am: 4a7c9b0563 
Change-Id: Icd476934bea864e21c996649957cd92b52c02b84
 2020-05-04 00:17:58 +00:00
Svet Ganov
4536fc34ec [automerger skipped] Updating platform SDK version for R am: 38cd221d81 am: 8f439f08f9 am: d874725e02 am: 092a7a6b19 -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 38cd221d81 is in history

Change-Id: I9bd979587449a3185e855118ad706012143060fa
 2020-05-04 00:16:39 +00:00
Jay Aliomer
4a7c9b0563 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: db715d9dc1 am: d5956a11c3 
Change-Id: Ic4b2baee2797aac36f27a0401b5becd2ed74de99
 2020-05-04 00:02:06 +00:00
Svet Ganov
092a7a6b19 Updating platform SDK version for R am: 38cd221d81 am: 8f439f08f9 am: d874725e02 
Change-Id: I11c15a39b114178c7564404bfbfd1ea123a69c5e
 2020-05-03 23:53:41 +00:00
Jay Aliomer
b476b60b8b Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: ea3df954c1 am: a9a5836367 
Change-Id: I1c8c96bc691b2f38e6728598511cb3dfff98c439
 2020-05-03 23:53:36 +00:00
Automerger Merge Worker
06c1421c39 Merge "[automerger skipped] Updating platform SDK version for R am: 38cd221d81 -s ours am: 0585f9e357 -s ours" into rvc-d1-dev-plus-aosp am: 903a851a3d -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 38cd221d81 is in history

Change-Id: I0ca6a9542f0dfcc2333ac7dc7910466dc64c649c
 2020-05-03 23:52:12 +00:00
Jay Aliomer
ddf4b5a44d Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: db715d9dc1 am: 61f8c32f98 
Change-Id: Ice13daa12af0a6eda3b0ca6084bc2fc3a89349f5
 2020-05-03 23:48:03 +00:00
Svet Ganov
fc2dc64db5 [automerger skipped] Updating platform SDK version for R am: 38cd221d81 am: 8f439f08f9 -s ours am: a084943038 -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 87ccbfaa46 is in history

Change-Id: I10fe908fc12d409ef0fc55ffe894a17c1bffa2ee
 2020-05-03 23:45:16 +00:00
Jay Aliomer
d5956a11c3 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: db715d9dc1 
Change-Id: Id0ee1e3343c7198e669c2072a23707945bfa1382
 2020-05-03 23:38:46 +00:00
Jay Aliomer
a9a5836367 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: ea3df954c1 
Change-Id: I5e7cb425236c76c3c5da5e27074071618058fa48
 2020-05-03 23:33:05 +00:00
Svet Ganov
d874725e02 Updating platform SDK version for R am: 38cd221d81 am: 8f439f08f9 
Change-Id: Ifb35d9c066fa005150b568962020c5cf82971216
 2020-05-03 23:32:42 +00:00
Automerger Merge Worker
903a851a3d Merge "[automerger skipped] Updating platform SDK version for R am: 38cd221d81 -s ours am: 0585f9e357 -s ours" into rvc-d1-dev-plus-aosp 2020-05-03 23:32:30 +00:00
Jay Aliomer
61f8c32f98 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 am: db715d9dc1 
Change-Id: I293620f96a420804ea97bce639492f9248810289
 2020-05-03 23:31:53 +00:00
Svet Ganov
31020c4b84 [automerger skipped] Updating platform SDK version for R am: 38cd221d81 -s ours am: 0585f9e357 -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 87ccbfaa46 is in history

Change-Id: I4a7985bb32ecac2e8aec0532477aaf1fd91d6196
 2020-05-03 23:31:30 +00:00
Svet Ganov
a084943038 [automerger skipped] Updating platform SDK version for R am: 38cd221d81 am: 8f439f08f9 -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 87ccbfaa46 is in history

Change-Id: Iec0105af8cc1df6fc688578775f58d082c1c59a6
 2020-05-03 23:31:08 +00:00
Jay Aliomer
db715d9dc1 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 
Change-Id: I2495815bef97348f21a56af08976d81699a0cc3a
 2020-05-03 23:20:30 +00:00
Svet Ganov
8f439f08f9 Updating platform SDK version for R am: 38cd221d81 
Change-Id: I28edde22542b8fd44a0633b91be3131a7ff1144d
 2020-05-03 23:16:16 +00:00
Jay Aliomer
ea3df954c1 Merge "Added "waiting for screen off" flag to dump" into rvc-dev am: 856ec84b37 
Change-Id: I43c9315eab58d1fe4843c6d799af0dfe56f11433
 2020-05-03 23:15:26 +00:00
Svet Ganov
0585f9e357 [automerger skipped] Updating platform SDK version for R am: 38cd221d81 -s ours 
am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 87ccbfaa46 is in history

Change-Id: Ie47e30847efedf24cbef94e0df8ec0f0cc63be95
 2020-05-03 23:14:37 +00:00
Jay Aliomer
856ec84b37 Merge "Added "waiting for screen off" flag to dump" into rvc-dev 2020-05-03 23:09:07 +00:00
Bill Yi
d41de1bb47 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3b97ee896d10d653d5225562e3b41907fba02cf6
 2020-05-03 15:15:47 -07:00
Bill Yi
e8289e9f1b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I1956532e65309d5522691a8ceabd6671a92354db
 2020-05-03 14:37:24 -07:00
Jeff Chang
f87b2560db Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: ef31035152 am: e1a7391cff am: 4ad02bcaeb 
Change-Id: I5778796e7a93b9571f31b659a5529d5e5e4fac04
 2020-05-03 16:59:57 +00:00
Svet Ganov
38cd221d81 Updating platform SDK version for R 
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
 2020-05-03 09:58:54 -07:00
Jeff Chang
8700e35d57 Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: 1e29180890 am: 767341c7d0 
Change-Id: I357ee9aa416a6c35fbe665a79f8556d0e3823fab
 2020-05-03 16:34:38 +00:00
Jeff Chang
4ad02bcaeb Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: ef31035152 am: e1a7391cff 
Change-Id: Ib2f7dea8057e91f0152ffc62497cdd9fab41e83c
 2020-05-03 16:34:26 +00:00
Jeff Chang
5c9d73e2f6 Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: ef31035152 am: a7d816951d 
Change-Id: I60fb2388560a5526b2abe0a8ca10f2f3459cbda3
 2020-05-03 16:34:24 +00:00
Jeff Chang
767341c7d0 Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: 1e29180890 
Change-Id: Ic1f50713a0a6912e8a6effe57d89b0d566525b19
 2020-05-03 16:22:08 +00:00
Jeff Chang
e1a7391cff Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: ef31035152 
Change-Id: I59409fa9802e434daa60b63248cbb9868c09a367
 2020-05-03 16:22:03 +00:00
Jeff Chang
a7d816951d Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: ef31035152 
Change-Id: I3eabcef52976e0480dd234820ac55c61330140b1
 2020-05-03 16:21:47 +00:00
Jeff Chang
1e29180890 Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 
Change-Id: Ie0dd533d1403c44c231e1960e529d2ec1cdccca7
 2020-05-03 16:11:04 +00:00
Jeff Chang
ef31035152 Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 
Change-Id: I9c2057452199f9546b14a73a035fe8c30e7169fd
 2020-05-03 16:11:01 +00:00
Jeff Chang
495fd8e549 Merge "Protect against assumptions of a top focused stack." into rvc-dev 2020-05-03 15:52:07 +00:00
TreeHugger Robot
d44bde4eb8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1f3dceb43e -s ours am: 60b3757acb -s ours am: b288cf27e9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5003ee3dd2a9f511e3b421d09e727ba935efdb54
 2020-05-03 09:51:51 +00:00
TreeHugger Robot
3406a2826c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ef221e4eb2 -s ours am: 106d1a14f6 -s ours am: 41d8a3148e -s ours 
am skip reason: subject contains skip directive

Change-Id: I8c510e27a682e6359581f1aabf6dc8dc1d2ec9fc
 2020-05-03 09:51:37 +00:00
TreeHugger Robot
b288cf27e9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1f3dceb43e -s ours am: 60b3757acb -s ours 
am skip reason: subject contains skip directive

Change-Id: I4aacedf26062f73c29c04e9d7449017aa37ff5c3
 2020-05-03 09:30:55 +00:00
TreeHugger Robot
7ec365f89f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1f3dceb43e -s ours am: 4bf9c7d24d -s ours 
am skip reason: subject contains skip directive

Change-Id: I816ffa12888ac5af14d0289b5745cc0d0d21e4d7
 2020-05-03 09:30:48 +00:00
TreeHugger Robot
41d8a3148e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ef221e4eb2 -s ours am: 106d1a14f6 -s ours 
am skip reason: subject contains skip directive

Change-Id: I85b74c6cc637b45b6f924f11bdf51bf47372827f
 2020-05-03 09:30:45 +00:00