Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a9912b7e6b Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-14 05:40:09 +00:00
TreeHugger Robot
41369c7d65 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1f3cd594a12779e03fe19a0c9f375778e949d1c
 2020-06-14 05:34:52 +00:00
TreeHugger Robot
40e01bebc0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifaf6e0a67919191f9c1a0599b5beaff02cfded75
 2020-06-14 05:34:52 +00:00
TreeHugger Robot
96860e0ecc Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-14 05:25:29 +00:00
Bill Yi
0091ec712c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I44853f7ac781ca461feb6e816344cbfdb545c874
 2020-06-14 03:17:24 +00:00
Bill Yi
d573d464cb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I9deb7a8ca2a4fd931bd822badc7ae920696b3cd9
 2020-06-14 01:47:21 +00:00
Bill Yi
0edbd7bf02 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I4ee30f50c8fc9ad7a9884eb5403a070f2ca40be0
 2020-06-14 01:24:36 +00:00
Bill Yi
1cced45622 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I70495288266b7fab214742fc409f2014760d86e8
 2020-06-13 23:54:24 +00:00
Automerger Merge Worker
79925d2fe7 Merge "[automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f -s ours am: 6aedfe30f6 -s ours am: 3cb291b4e9 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-13 23:26:07 +00:00
Automerger Merge Worker
27f336d106 Merge "[automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f am: 34d82e5117 am: 8eb24657b9 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-13 23:26:02 +00:00
TreeHugger Robot
edfe8109a9 [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f -s ours am: 6aedfe30f6 -s ours am: 3cb291b4e9 -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 cb6c91bc8d is in history

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

Change-Id: I533b6b27da7f6ef7154dc4bc695fda5a1b9924c9
 2020-06-13 23:25:55 +00:00
Automerger Merge Worker
7f8c24eb82 Merge "[automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b -s ours am: 9bfbd1b3b6 -s ours" into rvc-d1-dev-plus-aosp am: 6cbf1367e2 -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ee78ee9d87 is in history

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

Change-Id: Ib201a5bd1957f3d28c5906964692870105dad90b
 2020-06-13 23:25:49 +00:00
TreeHugger Robot
8005362bf4 [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f am: 34d82e5117 am: 8eb24657b9 -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 328a29cc48 is in history

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

Change-Id: I64235f2cacccc68de103e7ac7858e272e559c914
 2020-06-13 23:25:45 +00:00
TreeHugger Robot
578780711b [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f am: 34d82e5117 -s ours am: 391ed0ed5b -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 328a29cc48 is in history

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

Change-Id: Ib92c4d14c5b4e28e479a012d2f25baa3aafcee90
 2020-06-13 23:25:34 +00:00
Automerger Merge Worker
993b8a47a9 Merge "[automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b am: 6091152b5d am: ebcc69926f -s ours" into rvc-qpr-dev-plus-aosp 2020-06-13 23:25:14 +00:00
TreeHugger Robot
19debff309 [automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b am: 6091152b5d am: ebcc69926f -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ab17065423 is in history

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

Change-Id: I74e59f522e4d86c76114e418671a85880bfbc3eb
 2020-06-13 23:25:03 +00:00
TreeHugger Robot
8e654597d7 [automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b am: 6091152b5d -s ours am: 5b1ae63f94 -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ab17065423 is in history

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

Change-Id: Ica012a143bef6497cc94f3c27fd64ef340b8d140
 2020-06-13 23:24:47 +00:00
TreeHugger Robot
8eb24657b9 Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f am: 34d82e5117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802277

Change-Id: I86f285ca64706aa65d2fa13cddf2f7ce826d6e28
 2020-06-13 23:13:06 +00:00
TreeHugger Robot
ebcc69926f Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b am: 6091152b5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11770061

Change-Id: I1363daca911d1fa6431e27fa868d4e47a7605e4f
 2020-06-13 23:12:58 +00:00
TreeHugger Robot
3cb291b4e9 [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f -s ours am: 6aedfe30f6 -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 cb6c91bc8d is in history

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

Change-Id: Id9cbb36a81659a7d2321fd5bb9598ecac1d2c9ea
 2020-06-13 23:12:50 +00:00
Automerger Merge Worker
6cbf1367e2 Merge "[automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b -s ours am: 9bfbd1b3b6 -s ours" into rvc-d1-dev-plus-aosp 2020-06-13 23:12:47 +00:00
TreeHugger Robot
3d4302720f [automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b -s ours am: 9bfbd1b3b6 -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ee78ee9d87 is in history

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

Change-Id: Ia70fef86338501f45b5c161815986877d97384a2
 2020-06-13 23:12:39 +00:00
TreeHugger Robot
391ed0ed5b [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f am: 34d82e5117 -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 328a29cc48 is in history

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

Change-Id: If93906e22b13bd5a11d358829b16c342157c7c79
 2020-06-13 23:12:31 +00:00
TreeHugger Robot
5b1ae63f94 [automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b am: 6091152b5d -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ab17065423 is in history

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

Change-Id: I01e7432d752d4db87c6275cf54d77a5350febd65
 2020-06-13 23:12:08 +00:00
TreeHugger Robot
34d82e5117 Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802277

Change-Id: Ib88577e4c58842bc9226edbd0de41f3093fb9862
 2020-06-13 23:00:49 +00:00
TreeHugger Robot
6aedfe30f6 [automerger skipped] Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev am: a80c586d4f -s ours 
am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 328a29cc48 is in history

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

Change-Id: I9244f7fec486aa55c7785da1fdefbadc4eff62ce
 2020-06-13 23:00:47 +00:00
TreeHugger Robot
9bfbd1b3b6 [automerger skipped] Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b -s ours 
am skip reason: Change-Id I941b3c89402e2cfa290b3829e2ac8ff7ea67ca3d with SHA-1 ab17065423 is in history

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

Change-Id: I27dd563ebf59a14e458aa6826abb3c968162073e
 2020-06-13 23:00:22 +00:00
TreeHugger Robot
6091152b5d Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev am: 893cb7835b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11770061

Change-Id: I5d551e9eb76bfc0da73ff0d2e3c57a6e5afd0577
 2020-06-13 23:00:16 +00:00
TreeHugger Robot
a80c586d4f Merge "Add back missing tidy_checks, since tidy_checks_as_errors isn't enough" into rvc-dev 2020-06-13 22:39:03 +00:00
TreeHugger Robot
893cb7835b Merge "Use tidy_checks_as_errors list instead of -warnings-as-errors=*" into rvc-dev 2020-06-13 22:38:57 +00:00
Tej Singh
756541526a Mark bucket as condition_unknown properly 
Previously, if the condition was unknown for the entire bucket, the
bucket would be annotated with a NO_DATA rather than being dropped
because CONDITION_UNKNOWN. This updates all the buckets to be dropped
due to CONDITION_UNKNOWN. Note that this will make the condition unknown
problem appear worse, when in reality it is making our bucket drop
reasons more correct and should not have any impact on the true
CONDITION_UNKNOWN.

Also fix an issue where a test was failing due to a previous test
leaving data persisted to disk. This fix is a hack for now, and should
be properly fixed later.

Bug: 158897179
Test: atest statsd_test
Change-Id: Ic703600d37aa1873ec67cb1a279dcf349d48fc9f
 2020-06-13 03:50:59 -07:00
Automerger Merge Worker
3b22d4d2b8 Merge "Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 87d07e8891 am: bf8e7938db" into rvc-qpr-dev-plus-aosp 2020-06-13 10:07:06 +00:00
Automerger Merge Worker
ea76791971 Merge "Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 5f06fdba56 am: ff5b375287" into rvc-qpr-dev-plus-aosp 2020-06-13 10:06:53 +00:00
Michael Wachenschwanz
82c7e2bff2 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 87d07e8891 am: bf8e7938db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: I238519d1643c66989bbdcea36bd3ea07a36d4bc0
 2020-06-13 10:06:52 +00:00
Michael Wachenschwanz
f9232e93e3 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 5f06fdba56 am: ff5b375287 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: I664b165f2450485ef2f87f0936ba5b6c00cd6b79
 2020-06-13 10:06:35 +00:00
Michael Wachenschwanz
c9aef49262 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 5f06fdba56 am: 6c0acc2155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: I9f1a73b348b209d349a5b269e8d0077f4808c385
 2020-06-13 10:06:14 +00:00
Michael Wachenschwanz
bf8e7938db Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 87d07e8891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: Ib53f2003dc8136400f3315c91bdb569ab18eca1e
 2020-06-13 09:53:08 +00:00
Michael Wachenschwanz
ff5b375287 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 5f06fdba56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: Ibdd3470399c00a96b833d4b0697c327d46504da9
 2020-06-13 09:53:06 +00:00
Michael Wachenschwanz
6c0acc2155 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 am: 5f06fdba56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: I46b293bb3c2ac3949f1934c1af434a8df659329a
 2020-06-13 09:52:46 +00:00
Michael Wachenschwanz
5f06fdba56 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: Id554741de799b9ef7abe569515ce4f1ee1a9ce1b
 2020-06-13 09:35:11 +00:00
Michael Wachenschwanz
87d07e8891 Merge "Add BlobStore atoms" into rvc-dev am: 38da493ae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818786

Change-Id: Iccf6b1f4041ffb8a12f359167d8aa4e5a6b4f8ec
 2020-06-13 09:35:05 +00:00
Michael Wachenschwanz
38da493ae4 Merge "Add BlobStore atoms" into rvc-dev 2020-06-13 09:17:54 +00:00
Automerger Merge Worker
77d6156139 Merge "Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb am: 90e6d3ea98" into rvc-qpr-dev-plus-aosp 2020-06-13 07:24:36 +00:00
Automerger Merge Worker
41321314b4 Merge "Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: b673f56578" into rvc-d1-dev-plus-aosp am: 92b5ecb1fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I106414a0416cda31e74092a5d8638936eded6e9a
 2020-06-13 07:24:13 +00:00
TreeHugger Robot
4dea003037 Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb am: 90e6d3ea98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I4683c3493f37b357d06e567b25a4fa07671dd1ec
 2020-06-13 07:24:08 +00:00
TreeHugger Robot
cde5d67e8a Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb am: 921c37cab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I017afb0f9a93dad4cda1422f8a328d0a540daa41
 2020-06-13 07:23:50 +00:00
Yo Chiang
2812c3b042 DO NOT MERGE Temporarily rename the package name of BugReportApp 
There is some de-sync happening between AOSP and internal.
BugReportApp has been moved to AOSP as a platform APP, however the
package name is renamed to com.android.car.bugreport only in internal.
AOSP BugReportApp still have the old package name
com.google.android.car.bugreport.

A recent change I5e541138c35cdf67d18ce5475221baeb3e7faef4 moved the
privapp whitelist to AOSP, too. However that is the whitelist for
com.android.car.bugreport, not com.google.android.car.bugreport.

Since the only difference is the package name, I'll just point AOSP
BugReportApp to use the internal BugReportApp's whitelist, which is
privapp_whitelist_com.android.car.bugreport (without .google).
And change the package name in
privapp_whitelist_com.android.car.bugreport to
com.google.android.car.bugreport.

Use DO NOT MERGE as there are only temporary fixes and these
workarounds should all go away when next platform release lands.

Bug: 158151004
Test: TH presubmit
Change-Id: I35b90e4ff2428a8a685c51a7c49b371bcbb240e8
 2020-06-13 07:16:04 +00:00
Automerger Merge Worker
92b5ecb1fb Merge "Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: b673f56578" into rvc-d1-dev-plus-aosp 2020-06-13 07:08:16 +00:00
TreeHugger Robot
4a635a482a Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: b673f56578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I2f5f9a77b409a457eda25ed10a598a8aabd29821
 2020-06-13 07:08:05 +00:00
TreeHugger Robot
90e6d3ea98 Merge "Fix testValueMetric flake" into rvc-dev am: 5c4b92a1b9 am: f4ff2d13bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11853983

Change-Id: I342aa700cfa9aff2e893d1ee1314aaffc5cd5404
 2020-06-13 07:08:02 +00:00