summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android 12"HEADmasterXin Li2021-10-073-10/+14
|\
| * Merge Android 12Xin Li2021-10-063-10/+14
|/|
| * Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-masterXin Li2021-08-173-10/+14
| |\
| | * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-143-10/+14
| | |\
| | | * [automerger skipped] Merge "Update telephony OWNERS file" am: a2a4141193 am: ...Jayachandran Chinnakkannu2021-08-060-0/+0
| | | |\ | | | |/ | | |/|
| | | * Update telephony OWNERS file am: 43feaaf71dJayachandran C2021-08-041-3/+4
| | | |\
| | | | * Update telephony OWNERS fileandroid12-devJayachandran C2021-08-031-3/+4
| | | * | Merge changes from topic "remove_stk_no_menu" am: f35598c66d am: 91c7a85ada a...Jordan Liu2021-05-041-28/+16
| | | |\|
| | | | * Merge changes from topic "remove_stk_no_menu" am: f35598c66d am: 91c7a85ada a...Jordan Liu2021-05-041-28/+16
| | | |/|
| | | | * Merge changes from topic "remove_stk_no_menu" am: f35598c66d am: 91c7a85adaJordan Liu2021-05-041-28/+16
| | | | |\
| | | * | | Merge "Override the label of the SIM Toolkit application dynamically" am: 22d...Jordan Liu2021-04-132-46/+84
| | | |\| |
| | | | * | Merge "Override the label of the SIM Toolkit application dynamically" am: 22d...Jordan Liu2021-04-132-46/+84
| | | | |\ \
| | | * | | | Make intent immutableJordan Liu2021-02-221-1/+1
| | | * | | | [automerger skipped] Mark ab/7061308 as merged in stage. am: d5e97b5a8e -s ou...Xin Li2021-02-200-0/+0
| | | |\| | |
| | | | * | | [automerger skipped] Mark ab/7061308 as merged in stage. am: d5e97b5a8e -s oursXin Li2021-02-200-0/+0
| | | | |\ \ \
| | | * | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Stk" am: 7780edce92 am:...Bob Badour2021-02-051-0/+17
| | | |\| | | |
| | | | * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Stk" am: 7780edce92 am:...Bob Badour2021-02-051-0/+17
| | | | |\ \ \ \
| | | * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0a7335dc...Xin Li2020-12-100-0/+0
| | | |\| | | | |
| | | * | | | | | [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 1...Xin Li2020-12-030-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Update material library to 1.2.1"Cyril Lee2020-11-111-1/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Update material library to 1.2.1Cyril Lee2020-11-051-1/+4
| | | * | | | | | | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ...Bill Yi2020-11-050-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NO...Bill Yi2020-11-050-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...Bill Yi2020-11-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Follow rename of HomeVisibilityObserverHall Liu2020-10-132-8/+9
| | | * | | | | | | | | | Merge "Revert "Follow rename of HomeVisibilityObserver""Makoto Onuki2020-10-132-9/+8
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Revert "Follow rename of HomeVisibilityObserver"Makoto Onuki2020-10-132-9/+8
| | | * | | | | | | | | | | Merge "Follow rename of HomeVisibilityObserver"Hall Liu2020-10-132-8/+9
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Follow rename of HomeVisibilityObserverHall Liu2020-10-062-8/+9
| | | * | | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: 9097e07c4b -s ours am: d8f...Xin Li2020-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Skip RP1A.201005.006" am: ebb67037...Treehugger Robot2020-10-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Skip RP1A.201005.006 am: 6f11dafd7e am: 1...The Android Open Source Project2020-10-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Set OP to msg.what instead of msg.arg1 am: dfe93b3d6e am: efc3a3ff35 am: 43e5...Jordan Liu2020-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: dfe93b3d6e am: 856a766c52 am: 3bde...Jordan Liu2020-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: dfe93b3d6e am: efc3a3ff35 am: b6a0...Jordan Liu2020-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: dfe93b3d6e am: d633788ab2Jordan Liu2020-09-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: dfe93b3d6eandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseJordan Liu2020-09-251-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | [automerger skipped] Treat recentapps as home press for STK dialogs am: 4f605...Jordan Liu2020-09-130-0/+0
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Treat recentapps as home press for STK dialogs am: 4f605ac238android-mainline-11.0.0_r35Jordan Liu2020-08-061-2/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Revert "Remove deprecated unenforced permission from manifest." and replace i...Amit Mahajan2020-09-130-0/+0
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Revert "Remove deprecated unenforced permission from manifest." and replace i...Amit Mahajan2020-07-061-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Merge Android R" am: 4ce8353c92 -s ours am: e9b02...Xin Li2020-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Specify OP_HOME_KEY_PRESSED correctly" am: 3ec54c...Jordan Liu2020-08-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: 468951abd0 am: 96cd6cdc35 am: 545d...Jordan Liu2020-08-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set OP to msg.what instead of msg.arg1 am: 468951abd0 am: fd925fb99b am: 0ba6...Jordan Liu2020-08-211-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do not set notification title to app name am: 3bd92cda73 am: 5213b57fb5 am: e...Jordan Liu2020-08-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do not set notification title to app name am: 3bd92cda73 am: 1943d591b2 am: 1...Jordan Liu2020-08-131-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Treat recentapps as home press for STK dialogs am: 4f605...Jordan Liu2020-08-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Treat recentapps as home press for STK dialogs am: 4f605...Jordan Liu2020-08-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \