Commit graph

3963 commits

Author SHA1 Message Date
Kyle Zhang
62297abdaa Move Widevine drm to gs-common am: 67a21afc77 am: 3aea6b84fb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22603860

Change-Id: I8c5439364ed35968e606c48f9c65ecdf03b06205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:47:50 +00:00
Kyle Zhang
7714aace77 Move Widevine drm to gs-common am: 67a21afc77 am: 2b9f6c9759
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22603860

Change-Id: Ief52541bab6dabea672b99d9a10431d1ea165b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:45:39 +00:00
Kyle Zhang
3aea6b84fb Move Widevine drm to gs-common am: 67a21afc77
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22603860

Change-Id: Ic144903ee37a3b51a40df23565aee15d030fd29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:01:41 +00:00
Kyle Zhang
37e8f3f731 Move Widevine drm to gs-common am: 67a21afc77
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22603860

Change-Id: Iaf7444cab473fefcad4351c1e73e8e83534d1c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:01:30 +00:00
Kyle Zhang
2b9f6c9759 Move Widevine drm to gs-common am: 67a21afc77
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22603860

Change-Id: If7848908e672c7aeecd2f9e4a247fd792a52615e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:00:16 +00:00
Kyle Zhang
67a21afc77 Move Widevine drm to gs-common
Bug: 277764729
Change-Id: I5ddd1153cdeb68d2ee9b0f4cda2080f55c9c008b
2023-04-27 21:21:06 +00:00
Bruno BELANYI
4dc5f6cb65 [automerger skipped] Define mali configuration path explicitly am: cd581af956 am: 9ac3878239 -s ours am: 8ecdd7607a -s ours
am skip reason: Merged-In Id168e9ce380eb6d3657a83e74ec8afd52bbd584e with SHA-1 cd581af956 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I9139268640d24c21a13119a8e0319cb3842551e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:02:33 +00:00
Bruno BELANYI
d3f8c6b851 [automerger skipped] Define mali configuration path explicitly am: cd581af956 am: a68f574b4c am: bc936b544e -s ours
am skip reason: Merged-In Id168e9ce380eb6d3657a83e74ec8afd52bbd584e with SHA-1 cd581af956 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I0599c7e732f4cbe88d84c49daf0494ffda497409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:01:06 +00:00
Bruno BELANYI
8ecdd7607a [automerger skipped] Define mali configuration path explicitly am: cd581af956 am: 9ac3878239 -s ours
am skip reason: Merged-In Id168e9ce380eb6d3657a83e74ec8afd52bbd584e with SHA-1 cd581af956 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I5005054137802fb237238c7cac5292a0cf14bb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:23:27 +00:00
Bruno BELANYI
bc936b544e Define mali configuration path explicitly am: cd581af956 am: a68f574b4c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: If97756aa78e3dc0ef7bb1ad77f4e7201a7d960b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:20:20 +00:00
Bruno BELANYI
7961929fe0 [automerger skipped] Define mali configuration path explicitly am: cd581af956 am: a4a4b87a92 -s ours
am skip reason: Merged-In Id168e9ce380eb6d3657a83e74ec8afd52bbd584e with SHA-1 aa5b1036db is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I0ce6e39538fdb3bf868dd4699e60ea72dcd56afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:18:58 +00:00
Bruno BELANYI
a4a4b87a92 Define mali configuration path explicitly am: cd581af956
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I8a29179c204bd8cc41f6692aa0f1b62e02ef7c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 08:45:00 +00:00
Bruno BELANYI
a68f574b4c Define mali configuration path explicitly am: cd581af956
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: Ic06362136f9c37b6c5dd6ab38972244c901df57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 08:44:55 +00:00
Bruno BELANYI
9ac3878239 Define mali configuration path explicitly am: cd581af956
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22786012

Change-Id: I9e86dddc6925513c918e6501b1acd74f8dfeba73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 08:40:38 +00:00
Bruno BELANYI
cd581af956 Define mali configuration path explicitly
This avoids mali trying to read `/data/data/com.mali.testjava` for its
debug config.

Bug: 205779871
Bug: 264489188
Test: manual - reboot device and check the absence of AVC denials
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa5b1036db7f53d253d533cded53654974f773c2)
Merged-In: Id168e9ce380eb6d3657a83e74ec8afd52bbd584e
Change-Id: Id168e9ce380eb6d3657a83e74ec8afd52bbd584e
2023-04-27 08:06:38 +00:00
Jerry Huang
0ce60302f6 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728 am: d73fc7a7b7 am: 9ac317e04d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: Ie8d65d1adec557423c0857b1e8245a8211c80381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 13:06:03 +00:00
Jerry Huang
e9e1500c65 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728 am: 1f6b33bd1d am: b8b31c3a50
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I33d82a26bcdbf4f85fee33d30bc18abfe714f287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:53:40 +00:00
Jerry Huang
9ac317e04d gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728 am: d73fc7a7b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I09daff674caac538b2dcc850703f83c4afd8bc68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:14:58 +00:00
Jerry Huang
3919498c42 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728 am: 63da7ae057
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I68f42544a4ed998b2ed9ab8ff8d10b50923b8336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:12:05 +00:00
Jerry Huang
b8b31c3a50 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728 am: 1f6b33bd1d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I917176e17b8c7d641a0d4857ace57d7ef60fa3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:10:31 +00:00
Jerry Huang
1f6b33bd1d gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I5a9d4ca82b093985bc08397d18e127330e136b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:33:29 +00:00
Jerry Huang
63da7ae057 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I5212ca652cbd27c3ec7dc90b743a4357a943d624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:32:46 +00:00
Jerry Huang
d73fc7a7b7 gs201: update media_codecs_performance_c2.xml secure codec am: b7f7117728
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22845336

Change-Id: I590f8d4e38fabe0092eae1cf339ffe542ae99a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:29:46 +00:00
Cyan_Hsieh
1c2d71b7ec Add device mk OWNERS am: 060e11883f am: 0434b7308b am: de94ec3361
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: Ie20ff7c4e87290fd6cd0e17cbb6081a00b6c83f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 09:05:59 +00:00
Cyan_Hsieh
09101a23ee Add device mk OWNERS am: 060e11883f am: 7f7c81e924 am: 2deae729ce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: If99680b9c8f5a9d421af6ac59d2816125bebcc4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:47:01 +00:00
Cyan_Hsieh
a48fc774af Add device mk OWNERS am: 060e11883f am: f865a7d9eb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: If738363f854f0f24a47e4dd3fce422c098746362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:33:25 +00:00
Cyan_Hsieh
de94ec3361 Add device mk OWNERS am: 060e11883f am: 0434b7308b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: I728449ca99598bfd841ca24bd7ff480d5a1bc24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 08:30:31 +00:00
Cyan_Hsieh
f865a7d9eb Add device mk OWNERS am: 060e11883f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: Id941b3a868d2a38d497d2c8b7d46e1cf31f596b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:54:03 +00:00
Cyan_Hsieh
2deae729ce Add device mk OWNERS am: 060e11883f am: 7f7c81e924
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: I7f6052dd6e0b23b0ed8079e39a9e54826fe75dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:37:20 +00:00
Cyan_Hsieh
0434b7308b Add device mk OWNERS am: 060e11883f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: I1b05de920ae77eab52c61cf7807c3c470334b161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:36:53 +00:00
Jerry Huang
b7f7117728 gs201: update media_codecs_performance_c2.xml secure codec
performance point of non-secure codec should be the same as secure codec.

Bug: 275148623
Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest
Change-Id: I799c6f28d375efb1a3c09a5242a6ff3e9b6159f7
2023-04-25 07:01:00 +00:00
Cyan_Hsieh
7f7c81e924 Add device mk OWNERS am: 060e11883f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22759800

Change-Id: Ide7d16664a4511a032c23eddb4718e795cbe0278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 06:25:28 +00:00
Cyan_Hsieh
060e11883f Add device mk OWNERS
Bug: 278167548
Change-Id: I0ec91d8e1347e7dd46dbbfddfb33e3c92aac6c0a
2023-04-25 05:34:53 +00:00
Kyle Tso
9e8f1456b8 usb: Temporarily disable compliance warning am: 55082ca17e am: b56d721af6 am: 7ddded7cce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I6f06c993e03db025d1bab5b49ce39a571007d7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:30:26 +00:00
Kyle Tso
228c52a7f0 usb: Temporarily disable compliance warning am: 55082ca17e am: c9781b9b67 am: f9eb8bea0a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I747506f02f58e1a220531b9e1a1fe8d41d2599f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:30:04 +00:00
Kyle Tso
7ddded7cce usb: Temporarily disable compliance warning am: 55082ca17e am: b56d721af6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: Ibf152cce731d068b0fd7a850c569d0969d205560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:53:19 +00:00
Kyle Tso
f9eb8bea0a usb: Temporarily disable compliance warning am: 55082ca17e am: c9781b9b67
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I5227a37f577fb09878025b3889511fc468417e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:48:35 +00:00
Kyle Tso
1d4741f5e2 usb: Temporarily disable compliance warning am: 55082ca17e am: 0cfe76a417
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I737e9ac4d4b94b83d15443b7076c23ed79e7cc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:48:34 +00:00
Kyle Tso
c9781b9b67 usb: Temporarily disable compliance warning am: 55082ca17e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I54314fdfa9ace36eab7f9343aafd81cfbb9ca625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:10:47 +00:00
Kyle Tso
0cfe76a417 usb: Temporarily disable compliance warning am: 55082ca17e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I418050450a9f77d65caad1d819363640a0d23f13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:10:44 +00:00
Kyle Tso
b56d721af6 usb: Temporarily disable compliance warning am: 55082ca17e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22791798

Change-Id: I5216873c061ff46ad55ca97120e235742754d936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:06:35 +00:00
Kyle Tso
55082ca17e usb: Temporarily disable compliance warning
Revert me once the issue is fixed.

Bug: 278018111
Change-Id: I198c4a42aa8b64fef90817474710295d68497dda
Signed-off-by: Kyle Tso <kyletso@google.com>
2023-04-22 10:03:27 +00:00
Xin Li
5704bfdd29 Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 2bb0ac716a am: 6346b71e91 am: 0682fb1d3c am: d6dc1ed989
Original change: undetermined

Change-Id: I55f19e6dc9014a6a113fa37992ba7d678ece1e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:52:53 +00:00
Xin Li
d6dc1ed989 Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 2bb0ac716a am: 6346b71e91 am: 0682fb1d3c
Original change: undetermined

Change-Id: Ia65e3eb28e9113eb15031acb4f9679eb1c6bddb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:12:10 +00:00
Xin Li
0682fb1d3c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 2bb0ac716a am: 6346b71e91
Original change: undetermined

Change-Id: I8531f0d1a725eae4849c4be3c31f1e05aae93ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:51 +00:00
Xin Li
6346b71e91 Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 2bb0ac716a
Original change: undetermined

Change-Id: I29fa71e3463b6b2ae96331e4724a590728458ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:55 +00:00
Xin Li
2bb0ac716a Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:36:20 +00:00
Automerger Merge Worker
de01807e36 Merge "gs201: Cover pvmfw.img in vbmeta_system.img am: 8a6e7a8dfb am: fb75d93227 am: 3a1143cc41 am: 07878d0caa am: e00c275cd7" 2023-04-21 16:11:58 +00:00
Pierre-Clément Tosi
51c2ec3211 gs201: Cover pvmfw.img in vbmeta_system.img am: 8a6e7a8dfb am: fb75d93227 am: 3a1143cc41 am: 07878d0caa am: e00c275cd7
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510264

Change-Id: I6d135fd7a61f4aa0d9a7ce77aee4636af3a4d96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 16:11:45 +00:00
Pierre-Clément Tosi
c8d8e8b7e3 gs201: Cover pvmfw.img in vbmeta_system.img am: 8a6e7a8dfb am: fb75d93227 am: 3a1143cc41 am: 07878d0caa am: ac9998c048
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510264

Change-Id: I9596ee66a361c885344ff81bb952b92f5b9e31e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 16:11:35 +00:00