Kalesh Singh
872885b5b1
[automerger skipped] Merge "update_verifier: Verify blocks" into tm-qpr-dev am: 9fd1bd240e
-s ours
...
am skip reason: Merged-In I18946fb730376f19cce0738bd6765d5f5d0248b6 with SHA-1 dc1f6dadef
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20913763
Change-Id: Ib2afb99a53f00f95aa0e3efc6968df770aad081e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 17:52:50 +00:00
Akilesh Kailash
45a1d9d528
[automerger skipped] update_verifier: Verify blocks am: 2fa4a46b46
-s ours
...
am skip reason: Merged-In I18946fb730376f19cce0738bd6765d5f5d0248b6 with SHA-1 dc1f6dadef
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20913763
Change-Id: Ifd9327fca11b7a2f310558af34dabaea3d58994a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 17:52:48 +00:00
Kalesh Singh
9fd1bd240e
Merge "update_verifier: Verify blocks" into tm-qpr-dev
2023-01-10 17:08:09 +00:00
Akilesh Kailash
2fa4a46b46
update_verifier: Verify blocks
...
Check if the block verification was already done
by snapuserd daemon - If so, skip the verification
process. If daemon failed to verify the block,
update_verifier will fallback and continue
the verification.
Bug: 193863442
Bug: 261913544
Test: OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Merged-In: I18946fb730376f19cce0738bd6765d5f5d0248b6
Change-Id: I18946fb730376f19cce0738bd6765d5f5d0248b6
2023-01-09 11:25:32 -08:00
Bill Yi
eb2fde62f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1788ccc385
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20847019
Change-Id: Ic58d7cffef7b3ed8bf8e07c8da5c0b74e3ade794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 22:48:46 +00:00
Bill Yi
1788ccc385
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9ca1643c37cf1ccdfecff4bfd0f405718be75669
2022-12-29 20:40:13 -08:00
Bill Yi
a28ff36205
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b904bdb445
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/20781597
Change-Id: I96cd220c1661d3754f35e15d9172ad6b4b737880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 06:14:04 +00:00
Bill Yi
b904bdb445
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I966dc384c93bb8ff1fc53620f8f69fce32f81000
2022-12-19 01:04:29 -08: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
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
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
80267eba5d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I242fd8d1a2309f4b64c88df8d4eac840ccb0eca2
2022-11-16 04:29:52 -08: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
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
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
d1e5cf0eae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49504e35c1adce5761e22c46c858fca0eada73cf
2022-10-15 15:15:41 -07: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
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
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
872002acd6
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
am: 581fd1501b
am: b9754fd79f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: Ic2928881207a47262f636333439f0933f434592a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 10:08:03 +00:00
Treehugger Robot
b9754fd79f
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
am: 581fd1501b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I69adf0ce6c461c1398189e91c85c93ee7d2f1ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 09:11:29 +00:00
Treehugger Robot
581fd1501b
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
am: 71a1763a22
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I1494af60d2db6b3d811a5f2bc59bdb5ea1169629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 07:59:40 +00:00
Treehugger Robot
71a1763a22
Merge "minui: Support main fbdev connector in multi connector Blank function" am: 3f125fa897
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2205736
Change-Id: I3ccaadcd270449cec151dc29d98005e98d77cdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 06:59:34 +00:00
Treehugger Robot
3f125fa897
Merge "minui: Support main fbdev connector in multi connector Blank function"
2022-09-13 06:30:12 +00:00
Treehugger Robot
785a57c223
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
am: cf6787a035
am: 9ac03302f7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: I35108471c4a917f39e3953360fd8ec7cc71cda15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 23:49:54 +00:00
Treehugger Robot
9ac03302f7
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
am: cf6787a035
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: Id290d6dda14e8ff771d40499116eb11d448dd0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 23:22:08 +00:00
Treehugger Robot
cf6787a035
Merge "Remove py2 usages" am: a773d405d1
am: a0ef72ec5f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: Ide4a814793673b7d8e95c33474effc355725b40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 22:42:49 +00:00
Treehugger Robot
a0ef72ec5f
Merge "Remove py2 usages" am: a773d405d1
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944
Change-Id: I10e2491bfe1ccbd2fa88bdbb40a52457988e9f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:55:00 +00:00
Treehugger Robot
a773d405d1
Merge "Remove py2 usages"
2022-09-12 21:25:33 +00:00
Cole Faust
03a12e2ac9
Remove py2 usages
...
Bug: 203436762
Test: m nothing
Change-Id: I22087b1bbcb4fff64cc41210c9d74537197bb367
2022-09-12 12:27:06 -07:00
Kelvin Zhang
9478a87fae
[automerger skipped] [automerge] Fix misconfigured recovery host test 2p: d3cd440d2d
am: f3419014dc
am: 8ce6c88860
-s ours am: 031df89b1d
-s ours am: 8474ab13e1
-s ours am: 8cea2956a5
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 d3cd440d2d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19900295
Change-Id: Ic67d8c99269fa02a907129c6b20d6a9a3306c398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 21:27:23 +00:00