aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-0610-32/+464
|\
| * Handle null value for the recording_data_uri field am: 20322236e6Wally Yau2021-08-301-1/+1
| |\ | |/ |/|
* | Handle null value for the recording_data_uri fieldandroid-s-beta-5android-s-beta-5Wally Yau2021-08-271-1/+1
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1410-32/+464
| |\
| | * Add FLAG_IMMUTABLE to implicit PendingIntent am: 4762f27374 am: f724f14898Wally Yau2021-07-121-1/+2
| | |\ | | |/ | |/|
| * | Add FLAG_IMMUTABLE to implicit PendingIntent am: 4762f27374Wally Yau2021-07-121-1/+2
| |\ \ | |/ / |/| |
* | | Add FLAG_IMMUTABLE to implicit PendingIntentandroid-s-beta-4android-s-beta-3android-s-beta-4Wally Yau2021-07-091-1/+2
| | * Add license_text res/raw/third_party_licenses am: 18ae36961d am: 694bc1b4a7Bob Badour2021-06-231-14/+1
| | |\ | | |/ | |/|
| * | Add license_text res/raw/third_party_licenses am: 18ae36961dBob Badour2021-06-231-14/+1
| |\ \ | |/ / |/| |
* | | Add license_text res/raw/third_party_licensesBob Badour2021-06-221-14/+1
|/ /
| * Merge "Convert jank/Android.mk to Android.bp" am: 9522794f50 am: 95a3208d06Yuntao Xu2021-05-182-27/+22
| |\ | |/ |/|
* | Merge "Convert jank/Android.mk to Android.bp" am: 9522794f50Yuntao Xu2021-05-182-27/+22
|\ \
| * \ Merge "Convert jank/Android.mk to Android.bp"Yuntao Xu2021-05-182-27/+22
| |\ \
| | * | Convert jank/Android.mk to Android.bpYuntao Xu2021-04-292-27/+22
| | | * Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91f am: 2b...Yuntao Xu2021-05-102-20/+16
| | | |\
| | | | * Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91f am: 2b...android12-devYuntao Xu2021-05-102-20/+16
| | | | |\
| | | | | * Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91fYuntao Xu2021-05-102-20/+16
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Convert Android.mk to Android.bp" am: 1ea232f323Yuntao Xu2021-05-102-20/+16
|\| | | | |
| * | | | | Merge "Convert Android.mk to Android.bp"android-s-beta-2android-s-beta-1Yuntao Xu2021-05-102-20/+16
| |\ \ \ \ \
| | * | | | | Convert Android.mk to Android.bpYuntao Xu2021-04-302-20/+16
| | |/ / / /
| | | * | | Merge "Convert minijail/Android.mk to Android.bp" am: cf6de91aed am: 7b2a7973...Yuntao Xu2021-05-062-32/+32
| | | |\| |
| | | | * | Merge "Convert minijail/Android.mk to Android.bp" am: cf6de91aed am: 7b2a7973...Yuntao Xu2021-05-062-32/+32
| | | | |\|
| | | | | * Merge "Convert minijail/Android.mk to Android.bp" am: cf6de91aed am: 7b2a79735cYuntao Xu2021-05-062-32/+32
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Convert minijail/Android.mk to Android.bp" am: cf6de91aedYuntao Xu2021-05-062-32/+32
|\| | | | |
| * | | | | Merge "Convert minijail/Android.mk to Android.bp"Yuntao Xu2021-05-062-32/+32
| |\ \ \ \ \
| | * | | | | Convert minijail/Android.mk to Android.bpYuntao Xu2021-05-032-32/+32
| | | | * | | Merge "Convert func/Android.mk to Android.bp" am: 05f052f3d7 am: 7f375887af a...Yuntao Xu2021-05-052-26/+21
| | | | |\| |
| | | | | * | Merge "Convert func/Android.mk to Android.bp" am: 05f052f3d7 am: 7f375887af a...Yuntao Xu2021-05-052-26/+21
| | | | | |\|
| | | | | | * Merge "Convert func/Android.mk to Android.bp" am: 05f052f3d7 am: 7f375887afYuntao Xu2021-05-042-26/+21
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "Convert func/Android.mk to Android.bp" am: 05f052f3d7Yuntao Xu2021-05-042-26/+21
|\| | | | | |
| * | | | | | Merge "Convert func/Android.mk to Android.bp"Yuntao Xu2021-05-042-26/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Convert func/Android.mk to Android.bpYuntao Xu2021-04-292-26/+21
| | |/ / / /
| | | * | | Check for null calling Activity in SetupPassthroughActivity am: 928bbba890 am...Nick Chalko2021-04-292-21/+49
| | | |\| |
| | | | * | Check for null calling Activity in SetupPassthroughActivity am: 928bbba890 am...Nick Chalko2021-04-292-21/+49
| | | |/| | | | | | |/
| | | | * Check for null calling Activity in SetupPassthroughActivity am: 928bbba890 am...Nick Chalko2021-04-292-21/+49
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Check for null calling Activity in SetupPassthroughActivity am: 928bbba890Nick Chalko2021-04-292-21/+49
|\| | | |
| * | | | Check for null calling Activity in SetupPassthroughActivityNick Chalko2021-04-282-21/+49
| |/ / /
| | * | Disable dexpreopt and <uses-library> check for tests.Ulya Trafimovich2021-04-262-0/+8
| | * | [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TV am: 80fac3bfc7 am: fe45deb2...Bob Badour2021-04-215-2/+10
| | |\|
| | | * [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TV am: 80fac3bfc7 am: fe45deb279Bob Badour2021-04-215-2/+10
| | | |\ | |_|_|/ |/| | |
* | | | [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TV am: 80fac3bfc7Bob Badour2021-04-215-2/+10
|\| | |
| * | | [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TVBob Badour2021-04-205-2/+10
| | * | [automerger skipped] Add lint baseline to address NewApi errors am: 00d4ca917...Pedro Loureiro2021-04-150-0/+0
| | |\|
| | | * Add lint baseline to address NewApi errors am: 00d4ca9175 am: 932581d94ePedro Loureiro2021-04-153-0/+650
| | | |\ | |_|_|/ |/| | |
* | | | Add lint baseline to address NewApi errors am: 00d4ca9175Pedro Loureiro2021-04-153-0/+650
|\| | |
| * | | Add lint baseline to address NewApi errorsPedro Loureiro2021-04-143-0/+650
| | * | Add lint baseline to address NewApi errorsPedro Loureiro2021-04-123-0/+650
| | * | Merge "Broadcast inputId upon selection to LauncherX" into sc-devTreeHugger Robot2021-03-302-1/+62
| | |\ \
| | | * | Broadcast inputId upon selection to LauncherXKensuke Miyagi2021-03-302-1/+62
| | * | | Add new owner am: 674a5ceeb7 am: eeb4ede572 am: 320f1ba787Henry Fang2021-03-301-0/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/