Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772,901 Commits 3 Branches 0 Tags
159dd79fdbb3be3af1e1cc99d23764fd568d4be5
Commit Graph

772901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
159dd79fdb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ec4f48c990451c916ab514cd818ef49ad480f3e
 2022-12-21 03:57:28 -08:00
TreeHugger Robot
08e4594983 [automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours am: 85671779f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24b05cef38b6e276160aaf120dd61483088fb432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 01:25:06 +00:00
Pinyao Ting
c7cb9bb6a5 [automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours am: bd380fb2bd -s ours am: b26a560df5 -s ours am: 00dc9638d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fa111581320535c9d4b270835aa436222e17aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 01:24:59 +00:00
TreeHugger Robot
85671779f6 [automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I504a223be9a9190647281feb6e51e04be956e288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 00:34:18 +00:00
Pinyao Ting
00dc9638d9 [automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours am: bd380fb2bd -s ours am: b26a560df5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d01adb4f74657249296143c3192953b31840660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 00:33:47 +00:00
Patrick Baumann
c37d549f2a Merge changes from topic "b/262254794" into tm-dev am: a79341e01e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20765766

Change-Id: I7ac756783fc92f8e5f1547d2964de81ccc5733dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 23:56:22 +00:00
TreeHugger Robot
7e1bf5b798 [automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6b750014fa9bc10ca99ad387fd882d87a3b7fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 23:51:07 +00:00
Pinyao Ting
b26a560df5 [automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours am: bd380fb2bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54c2dd2ba4bcb29d66250a69058861eff34e339e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 23:50:45 +00:00
TreeHugger Robot
15dbdb2a73 [automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4d0f63849d408bfe2e687cf91926442ddf537bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 23:09:25 +00:00
Pinyao Ting
bd380fb2bd [automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d2cbf42fa0ffc56093701ddf1f99c8a706b02fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 23:09:14 +00:00
TreeHugger Robot
7a31586c29 [automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf9f8c53bcdf4e167ba0efddf7f61c97beaee717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 22:21:19 +00:00
Pinyao Ting
95f6f97d5b [automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c9f33543ffce7a1d742fb7e07a16d9a0427422d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 22:20:41 +00:00
TreeHugger Robot
cf3f62c4c9 Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216

Change-Id: I3f2cc2413f7b7ae1e72836dd43b40c4c56924d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 21:41:56 +00:00
Pinyao Ting
51361020b4 [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216

Change-Id: Ibdaf835400de7dc85693b99d54e69a16b23e5fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 21:41:27 +00:00
TreeHugger Robot
28dae0e4c9 Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev 2022-12-20 21:08:01 +00:00
Alex Buynytskyy
bbacb30ce5 [conflict] Moving PackageManagerServiceTests to their own suite. am: d4e51d102f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20764269

Change-Id: I55146fd3c41a9436883460f7c1dabd6bb53c2ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: Iacc89c7525d8d9beec39c242bfc305ad08844580
 2022-12-20 18:58:19 +00:00
Patrick Baumann
a79341e01e Merge changes from topic "b/262254794" into tm-dev 
* changes:
  Cleanup after test suite split.
  Moving PackageManagerServiceTests to their own suite.
 2022-12-20 17:03:41 +00:00
Andrew Solovay
0d8c13808e docs: Remove duplicated phrase am: c08a545ad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20759942

Change-Id: I44e284be393b6eac82d5b5b9546348f348f364e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-19 23:22:32 +00:00
Andrew Solovay
c08a545ad4 docs: Remove duplicated phrase 
Doc had duplicated the phrase "for some reason", removing it.
Docs-only change.

Change-Id: I4cda97bfcfd5f1ef8609741443e1c07afe17109b
Bug: 255896378
Test: [built docs with go/abtd]
 2022-12-19 18:41:06 +00:00
Josep del Río
58791f0a7e Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c am: 7d188c8207 am: d946501617 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I04fc9b761c1a92f56384f6e8f50e96ea5a700f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 18:56:20 +00:00
Josep del Río
d946501617 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c am: 7d188c8207 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I630dbad4e9d619f0f9fb188cfb1d40ce81b36831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 18:07:01 +00:00
Josep del Río
7d188c8207 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I193f10277d1250012df65355c2de605660f14f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 17:29:31 +00:00
Josep del Río
242667158c Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I1dae823cf968d9cf4772437b6391589cd2a960a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 16:50:23 +00:00
Josep del Río
d2fdb41514 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I521df4123142659f640ac32c5e72932eb3d71c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 16:01:53 +00:00
Josep del Río
5c8400f0d8 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: Ia4addaae8e16ca21be1748fd28240d11b7908f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 15:21:27 +00:00
Josep del Río
d1d3755436 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 am: 4a3603ed0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: I80e83c3f6a8c81d1919ba1d2abbc9c7266737312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 14:44:49 +00:00
Josep del Río
4a3603ed0a Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: 9a64b4bbe5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616

Change-Id: Ie47160e41ef1751dbaecb5953fa851a13598d35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 14:05:20 +00:00
Josep del Río
9a64b4bbe5 Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev 2022-12-17 13:11:02 +00:00
Bill Yi
c256dc7082 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am: c1f210a7ee -s ours am: 4ca5ab9765 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9de25072a00cceba951bb396511ad3bfe5eb6f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 01:24:32 +00:00
TreeHugger Robot
5772495194 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
133208dee1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
1bb95e9918 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
f6be9ef4b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
591fd3e28b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
eadd74d90d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
322a8b40a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
51ad2b1075 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
cf5eb46726 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
8ef3c5d8a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 01:05:45 +00:00
TreeHugger Robot
1d3c8ea070 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
e989a136e6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
b9ce532c49 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
e7c68e16ad Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
a136c764ea Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
7409bfe6d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
d276560455 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
42923fa72c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
TreeHugger Robot
e652dd9040 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:42:58 +00:00
Bill Yi
4ca5ab9765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am: c1f210a7ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I805ffccb044355b3a7a9087df0cf130dfc55add3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-17 00:35:16 +00:00
TreeHugger Robot
68d96c7eda Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-12-17 00:30:57 +00:00