Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,627 Commits 3 Branches 0 Tags
0900501df336946d4f505293c1424ca05a2e1d73
Commit Graph

660627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
0900501df3 Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: If9a4f5881898c62e4e6cc7e87b1b30ef4bae2804
 2021-11-16 09:57:48 +00:00
Neil Fuller
e9736ffc78 Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892637

Change-Id: Ife6269d4967a7d2588bc8f5bcc51eb06a1642a36
 2021-11-16 09:40:50 +00:00
Neil Fuller
a1afeb6910 Merge "Reverse ReferenceWithHistory.dump() order" 2021-11-16 09:30:11 +00:00
TreeHugger Robot
52ce494d8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa8f158180 -s ours am: 7184ee463b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74af16c4e6d0b6a22bb1f16d68ebe663bf929eb6
 2021-11-16 07:17:30 +00:00
TreeHugger Robot
3f3bbfc428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61d2cb4fce -s ours am: 2f84cf5dc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4867e83281af2970aa8c552455f2a6a868f8c81e
 2021-11-16 07:17:15 +00:00
TreeHugger Robot
644f937c57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours am: faaf3e29ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51c567284f0ae77020c161d7e89f0f07f3d65c50
 2021-11-16 07:16:58 +00:00
TreeHugger Robot
f36b39c3f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7a6c5ca061 -s ours am: 4f58265302 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife86a0af45e7cdde17dec4c7931856424899d274
 2021-11-16 07:16:27 +00:00
TreeHugger Robot
b0f850de6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fdbde9d234 -s ours am: 8ab754ba90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0711bc9940748c4e04d883af0b09365954600c7
 2021-11-16 07:16:11 +00:00
TreeHugger Robot
fdab94a145 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: acc9388848 -s ours am: 0012adbc9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35e19015c304e902baa2b64c20b710c923d85b85
 2021-11-16 07:15:33 +00:00
TreeHugger Robot
8b83ada65b Merge changes from topic "presubmit-am-a4905c0263fe4b63a3e22407af07914e" into sc-qpr1-dev am: ed4d7fd71a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230908

Change-Id: I95f1b98eb68df08c7cc2568b631bb17b7dc2d825
 2021-11-16 07:15:10 +00:00
Bill Yi
4299ac4df1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b365b4ba87 am: a7a2a5dea0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf2c14a5c9c08a1ec4f479a2b2e4a1d169bb485d
 2021-11-16 07:15:00 +00:00
TreeHugger Robot
e3a0428a59 Merge changes from topic "presubmit-am-a54ccbec81cc4ce89905e012539f525f" into sc-qpr1-dev am: f6f4eb4f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16236625

Change-Id: Ibc2a89d5263bf1f4e708351201e1089c3562aacb
 2021-11-16 07:13:54 +00:00
Bill Yi
c7a918ce7f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1b4c0aae22 am: a6c286553f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6623345c32846082a984f56d310afc1a70253e03
 2021-11-16 07:13:46 +00:00
TreeHugger Robot
74570617e2 Merge changes from topic "presubmit-am-4bb5dba41f984ec1ad67ebf208ade6f8" into sc-qpr1-dev am: 825143781b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16236633

Change-Id: I5b5227bfa8e6a776588de2d0dcbe1209184f40b4
 2021-11-16 07:13:05 +00:00
Bill Yi
0a21900884 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e7d4be95c1 am: a3c4dd3362 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6fb78767fb9caa5adb7a4a0893f407cf02950c4
 2021-11-16 07:12:59 +00:00
TreeHugger Robot
5b20c96d60 Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into sc-qpr1-dev am: a94df2076b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16239413

Change-Id: I2c7cf975dec66acc756cf9bb6db6767061b51691
 2021-11-16 07:12:24 +00:00
Bill Yi
b679589eaf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ce5e752f2d am: 7f2fb46a9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ed498c8ddb0871df0473d4e6fb4b07201a586fb
 2021-11-16 07:12:16 +00:00
TreeHugger Robot
3cd7152978 Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-qpr1-dev am: 33503d596a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16238718

Change-Id: Ib0dd6e37fb26952c146c238cb66b02275c454c12
 2021-11-16 07:11:18 +00:00
Bill Yi
00ca15072c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ceb81dd422 am: 89094583f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I385aeffcdc66cde57ae4d9e2fea1deb25b28bbdf
 2021-11-16 07:11:12 +00:00
TreeHugger Robot
7184ee463b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa8f158180 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb12945ed4974daeaaa36a281e99bae6c72e8732
 2021-11-16 07:10:57 +00:00
TreeHugger Robot
2f84cf5dc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61d2cb4fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b511e367b2daad2050067f42658af0c12513100
 2021-11-16 07:10:45 +00:00
TreeHugger Robot
faaf3e29ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie22e6dcbb209fb85917a7549e6e8a7b41e10be4d
 2021-11-16 07:10:34 +00:00
TreeHugger Robot
4f58265302 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7a6c5ca061 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e95a790b798317e4d8dcfd4e5a8798e9a7075d3
 2021-11-16 07:10:22 +00:00
TreeHugger Robot
78c60217a2 Merge changes from topic "presubmit-am-62c24e32cf454b58991df46fc5f21f70" into sc-qpr1-dev am: a3d7354ae9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16239929

Change-Id: I5ec261f8aa2ac92b5ab20c0fdbd6178b5c5a2353
 2021-11-16 07:10:19 +00:00
TreeHugger Robot
8ab754ba90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fdbde9d234 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9f979ca7984edf4217458f3d2684ac21eb21e57
 2021-11-16 07:10:14 +00:00
Bill Yi
f0437fcaa4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2506442388 am: 87a3ecc7a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5953eb116f6b97b70a640caaf3f592c4fdff85d
 2021-11-16 07:10:14 +00:00
TreeHugger Robot
0012adbc9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: acc9388848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a7a1b388ba16160b2d889844353d87d6dd43b02
 2021-11-16 07:10:01 +00:00
TreeHugger Robot
ed4d7fd71a Merge changes from topic "presubmit-am-a4905c0263fe4b63a3e22407af07914e" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b365b4ba87
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 07:08:50 +00:00
TreeHugger Robot
fa8f158180 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 07:08:50 +00:00
TreeHugger Robot
f6f4eb4f7e Merge changes from topic "presubmit-am-a54ccbec81cc4ce89905e012539f525f" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1b4c0aae22
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 07:04:57 +00:00
TreeHugger Robot
61d2cb4fce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 07:04:57 +00:00
TreeHugger Robot
825143781b Merge changes from topic "presubmit-am-4bb5dba41f984ec1ad67ebf208ade6f8" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e7d4be95c1
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 07:00:01 +00:00
TreeHugger Robot
22b77795b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 07:00:01 +00:00
TreeHugger Robot
a94df2076b Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ce5e752f2d
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 06:58:55 +00:00
TreeHugger Robot
7a6c5ca061 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:58:55 +00:00
TreeHugger Robot
33503d596a Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ceb81dd422
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 06:57:13 +00:00
TreeHugger Robot
fdbde9d234 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:57:13 +00:00
TreeHugger Robot
a3d7354ae9 Merge changes from topic "presubmit-am-62c24e32cf454b58991df46fc5f21f70" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2506442388
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-16 06:53:01 +00:00
TreeHugger Robot
acc9388848 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:53:01 +00:00
Treehugger Robot
b3135ed72d Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab am: 8d888d92ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888335

Change-Id: Ib9e2b3e5c248b3acbfea21e6eeda1ec879acd31c
 2021-11-16 04:30:08 +00:00
Treehugger Robot
8d888d92ed Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888335

Change-Id: I695b9b491873fba378affcc540ae03ddfae5e51a
 2021-11-16 04:18:54 +00:00
Treehugger Robot
999147b4ab Merge "remove PROP_QTAGUID_ENABLED" 2021-11-16 04:01:55 +00:00
Jonathan Lepage
2bf9cccba6 Merge "Document that Log can quietly swallow UnknownHostExceptions." am: 9d01845696 am: fc60d843e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873073

Change-Id: I15a8729ba9944915394570081760a58d0bb22d4a
 2021-11-16 00:44:24 +00:00
Treehugger Robot
cea58fa20b [automerger skipped] Merge "DO NOT MERGE" am: 02d371d6e4 -s ours am: 7a51a5f114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia727f4f67b0e16d23e7eae3669cd497476e7c234
 2021-11-16 00:43:47 +00:00
Jonathan Lepage
fc60d843e6 Merge "Document that Log can quietly swallow UnknownHostExceptions." am: 9d01845696 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873073

Change-Id: Ie844b6702567a50388f4ff62e9bc28dbebdd4e81
 2021-11-16 00:39:41 +00:00
Jonathan Lepage
9d01845696 Merge "Document that Log can quietly swallow UnknownHostExceptions." 2021-11-16 00:35:08 +00:00
Treehugger Robot
7a51a5f114 [automerger skipped] Merge "DO NOT MERGE" am: 02d371d6e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia828b447667dcf10cdf5275cdf6cb6873baa3e76
 2021-11-16 00:31:55 +00:00
Treehugger Robot
02d371d6e4 Merge "DO NOT MERGE" 2021-11-16 00:15:32 +00:00
Treehugger Robot
ac889bc8fc Merge "Fix the scanning on non-APEX devices." am: 6589fd106d am: fb8dbf9157 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889637

Change-Id: Iec41da939e171a9a7a03f076508e598595155960
 2021-11-15 23:12:02 +00:00
Treehugger Robot
fb8dbf9157 Merge "Fix the scanning on non-APEX devices." am: 6589fd106d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889637

Change-Id: I96575cfdec30d5b9e7183d6559fc223c359b34d7
 2021-11-15 22:57:09 +00:00