Commit graph

11272 commits

Author SHA1 Message Date
Bill Yi
6878299b78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0be94ca37d -s ours am: 15f6446114 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20628389

Change-Id: I433217d3cef0adef7077e906479f221782660caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:02:14 +00:00
Bill Yi
9029ef1cf1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 331c830f27 -s ours am: 6e253ed28f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20628389

Change-Id: Iccbea5a8d5913fdf9ee442becf0211c7dd0be3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:02:06 +00:00
Bill Yi
15f6446114 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0be94ca37d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20628389

Change-Id: I3362e0253e48acbc36303471e2020d77ee76bdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:05:25 +00:00
Bill Yi
6e253ed28f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 331c830f27 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20628389

Change-Id: I6ee6574d12bcb180d66eed9a5c51c15d9166f4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 19:05:17 +00:00
Bill Yi
0be94ca37d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Treehugger Robot
36f676bd76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a70f6d22e6 -s ours am: fcbe39e97d -s ours am: 3229e21a86 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: Ie47ff8245c20a55bd7ec8053e381408aa3921ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 20:43:25 +00:00
Bill Yi
9b84d72a7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8817e7acc -s ours am: e541f5b339 -s ours am: 7e35c0bb72 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: I51ecde56486499c5b96663781773d697d0a59690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 20:43:11 +00:00
Treehugger Robot
3229e21a86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a70f6d22e6 -s ours am: fcbe39e97d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: If93570d884884436f3cc35b611dc5a0d38c6831d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 19:37:20 +00:00
Bill Yi
7e35c0bb72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8817e7acc -s ours am: e541f5b339 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: I262b0e742f3695bfdf94c60ba1663c74ea049a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 19:37:04 +00:00
Treehugger Robot
fcbe39e97d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a70f6d22e6 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: I4280b17cc2f9e24610f11d08b8996d110c7023e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 18:45:23 +00:00
Bill Yi
e541f5b339 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8817e7acc -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2326613

Change-Id: I6b562a18ed10d9ce5b4cf95cf0ff61bbda9a3e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-04 18:45:06 +00:00
Treehugger Robot
a70f6d22e6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:54:15 +00:00
Bill Yi
331c830f27 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6336403b03cb47bf394d4fdebe31115d1e0511f2
2022-12-03 11:45:41 -08:00
Bill Yi
c8817e7acc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I067c002f71262a9be7bccff04f9f297192f81096
2022-12-03 11:28:30 -08:00
Bill Yi
b2d3a28201 Merge changes from topic "tc_change_22111610_28"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9fec52a3aa
  Import translations. DO NOT MERGE ANYWHERE
2022-11-21 02:01:29 +00:00
Bill Yi
f61ecda5a1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-17 05:24:19 +00:00
Bill Yi
c1bcbbfce1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80267eba5d -s ours am: 1100299052 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20493487

Change-Id: I4280e01f5fc426df6b2d4db532706c5dd215fa25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 21:21:58 +00:00
Bill Yi
1100299052 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80267eba5d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20493487

Change-Id: I9cdbb0d355ca479addf3cc5e583cbab033e84ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:54:54 +00:00
Bill Yi
62d4524e7a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9fec52a3aa
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20492664

Change-Id: Ia880d5c5a9af5c34e50b4302ad41c014e9d9df19
2022-11-16 18:21:40 +00:00
Bill Yi
80267eba5d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I242fd8d1a2309f4b64c88df8d4eac840ccb0eca2
2022-11-16 04:29:52 -08:00
Bill Yi
3904d224ce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I45798d475ad9ea058e04379733719ba6f263b356
2022-11-16 04:28:57 -08:00
Bill Yi
9fec52a3aa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2a94586ae970ce881cb1255be98deca847d17829
2022-11-16 04:28:02 -08:00
Treehugger Robot
87e08a606a Merge "Fix errorprone warnings that should be errors" am: 05480411c5 am: bfaf8b288b am: f131a19753
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256446

Change-Id: I8cfcb021d5ac665a3b617dbd963f1f1eddb3084c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 00:46:29 +00:00
Treehugger Robot
f131a19753 Merge "Fix errorprone warnings that should be errors" am: 05480411c5 am: bfaf8b288b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256446

Change-Id: I5a6a570a1b24a4de9c3cfdb580caeaab35a9bb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 00:13:53 +00:00
Treehugger Robot
bfaf8b288b Merge "Fix errorprone warnings that should be errors" am: 05480411c5
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256446

Change-Id: I1c7a2a51a7fc97d19a899c2220c407b0cd875ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20 23:45:22 +00:00
Treehugger Robot
05480411c5 Merge "Fix errorprone warnings that should be errors" 2022-10-20 23:11:41 +00:00
Bill Yi
57487e2581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1e5cf0eae -s ours am: d147802272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20203886

Change-Id: I02494b935987f47907cbf34720bc659f1fc9a62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 01:37:07 +00:00
Bill Yi
d147802272 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1e5cf0eae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20203886

Change-Id: I9e747a47a21675ad5c45cf7e4fb79eed4ec170f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 01:10:37 +00:00
TreeHugger Robot
eb263a3a74 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-10-17 16:51:11 +00:00
Cole Faust
e587589cda Fix errorprone warnings that should be errors
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I9393ceac22201e2bde4d5af7ec13e90d94956ed7
2022-10-15 21:33:27 -07:00
Bill Yi
ec015bf696 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8b8b05b41
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20203883

Change-Id: Ia4720b190685fb53b59602169427dc09e8aa493d
2022-10-16 02:57:31 +00:00
Bill Yi
d1e5cf0eae Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I49504e35c1adce5761e22c46c858fca0eada73cf
2022-10-15 15:15:41 -07:00
Bill Yi
f10c82044f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iffafd826e4fef375a34f13f01b0830468798fb76
2022-10-15 15:14:50 -07:00
Bill Yi
a8b8b05b41 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icc4fb6bae7b6e35c8769bac4d2ee0289df669396
2022-10-15 15:13:54 -07:00
Treehugger Robot
912d96c5ea Merge "Only check for powerwash in A/B ota packages" am: 56bca1f2d5 am: 31d74fa4ea am: e089b78334
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256203

Change-Id: I0ac2da4c4d7bd1c678a1e80e7b9e4ebee318ca65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 21:32:50 +00:00
Treehugger Robot
e089b78334 Merge "Only check for powerwash in A/B ota packages" am: 56bca1f2d5 am: 31d74fa4ea
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256203

Change-Id: I980e9a342f7ca39adb7a9c611afff695ba5a68e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 21:00:51 +00:00
Treehugger Robot
31d74fa4ea Merge "Only check for powerwash in A/B ota packages" am: 56bca1f2d5
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256203

Change-Id: I97b0be09883a1b1737388241a338f50cf4196603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 20:32:11 +00:00
Treehugger Robot
56bca1f2d5 Merge "Only check for powerwash in A/B ota packages" 2022-10-14 20:04:25 +00:00
Tim Zimmermann
78e524e418
Only check for powerwash in A/B ota packages
* A-only doesn't have payload_properties.txt
  causing an user-facing error

Change-Id: If749c9a8cf1c3bbdf0300a2da06ec2246fc75484
2022-10-14 20:06:41 +02:00
Xin Li
73a020b1e4 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8768f583c5 -s ours am: af1a8af755 -s ours
am skip reason: Merged-In Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2 with SHA-1 d43ec47f3b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20136138

Change-Id: Ia79ef98c17df569a29ca8761de91bf91d9faa9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:09:34 +00:00
Xin Li
af1a8af755 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8768f583c5 -s ours
am skip reason: Merged-In Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2 with SHA-1 d43ec47f3b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20136138

Change-Id: I0df089d0eb3d6a143d55953d208f761d27c91d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:55:36 +00:00
Xin Li
8768f583c5 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2
Change-Id: Ie94baaca2f1f365ed4768a763929d12418fcaff3
2022-10-06 11:59:14 -07:00
Treehugger Robot
e1804344ef Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd am: 50ed6648b1 am: cfccc925f6 am: 1e0da76374
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

Change-Id: Ia459e0e56de073692d2f37d41f20f2fa0e719619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 02:51:40 +00:00
Treehugger Robot
1e0da76374 Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd am: 50ed6648b1 am: cfccc925f6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

Change-Id: I8efd8d4c63c6bd5eb4c83d2951c9b7c25ef21804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:44:24 +00:00
Treehugger Robot
cfccc925f6 Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd am: 50ed6648b1
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

Change-Id: Ie0e68487a06dbca84e6a5275fcbb86c097cb763b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:16:27 +00:00
Treehugger Robot
50ed6648b1 Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e am: 859ebabebd
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

Change-Id: Ie993d5a357e77928d0a2dd5ea5ae5198c03a17b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 00:17:19 +00:00
Treehugger Robot
859ebabebd Merge "Fix doing silent update,power cut/restoration,screen is turned on" am: f07eaeb72e
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2229081

Change-Id: I13a5ccb2c28173859d1768066719872dceed20f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 23:47:10 +00:00
Treehugger Robot
f07eaeb72e Merge "Fix doing silent update,power cut/restoration,screen is turned on" 2022-09-27 23:14:04 +00:00
Hannah.Hsu
d43ec47f3b Fix doing silent update,power cut/restoration,screen is turned on
[Description]
1. In the current code, when tv enter recovery mode, it will
write "boot-recovery" into the BCB command field by default.
This is a protection mechanism to ensure that tv can re-enter
recovery mode continues OTA upgrade after power cut/power restoration.
So, when re-enter recovery mode, since there is no "quiescent"
in the boot parameters, the screen will turn on.

2. And we hope the screen will be turned off when tv re-enter
recovery mode to continue OTA upgrade.

3. We made the following modify:
In reocvery mode,According to GetBoolProperty
"ro.boot.quiescent"to determine whether it is a quiescent
boot this time,and then write "boot-recovery, quiescent"
or"boot-recovery" accordingly.

[Test Report]
1.boot up ok.
2.silent update ok.
(the screen is turned off when interrupting/
resume or complete the upgrade)
3.OTA update ok.
(the screen is turned on when interrupting/
resume or complete the upgrade)

Change-Id: Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2
2022-09-27 09:32:20 +08:00
Treehugger Robot
fa4e513d65 Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897 am: 71a1763a22 am: 581fd1501b am: b9754fd79f am: 872002acd6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736

Change-Id: I7e273dfa0b9a267453f214a347f9ac28fb7f0249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 10:35:32 +00:00