Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
555,996 Commits 3 Branches 0 Tags
74bb99708bd343be95e6a9d6f27f1446b9ea30bd
Commit Graph

555996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hall Liu
74bb99708b Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 am: 1bf919f084 am: 5b6beb2fc0 am: 2f8cf2f852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: Ib461b9a4f7271b9f9263cae8292dc5d0579fc102
 2020-09-16 01:25:39 +00:00
Hall Liu
2f8cf2f852 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 am: 1bf919f084 am: 5b6beb2fc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: Icd1e3d555c35652720cb724caf0311ebfab9df34
 2020-09-16 01:07:55 +00:00
Hall Liu
5b6beb2fc0 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 am: 1bf919f084 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: Ic2667293e9388b1bf29c8a38c89fa6b0925f27b0
 2020-09-16 00:37:59 +00:00
Hall Liu
1bf919f084 Merge "Expose Telecom constants for use in Telephony" am: 9fcb2819d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427473

Change-Id: I014d1c58714cf85fff87eb45cd49f01a23c4fad5
 2020-09-16 00:24:34 +00:00
TreeHugger Robot
a7a99f5dca Merge "Add package name when creating AudioTrack." into rvc-qpr-dev-plus-aosp 2020-09-16 00:12:00 +00:00
Hall Liu
9fcb2819d0 Merge "Expose Telecom constants for use in Telephony" 2020-09-16 00:05:18 +00:00
TreeHugger Robot
711f2271cd Merge "Enable mic & camera by default" into rvc-qpr-dev am: 204479a075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12565179

Change-Id: I627c9b560730feaa230db0e505fe934bb069cf29
 2020-09-15 23:59:22 +00:00
Hongwei Wang
1b48f8a74d Merge "Log the application uid in PipUiEventLogger" into rvc-qpr-dev am: 6aba13796f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12602091

Change-Id: I41b6ac4ef68bbc697d0c91481bc8b69629628fc9
 2020-09-15 23:32:48 +00:00
TreeHugger Robot
204479a075 Merge "Enable mic & camera by default" into rvc-qpr-dev 2020-09-15 23:31:54 +00:00
Hongwei Wang
6aba13796f Merge "Log the application uid in PipUiEventLogger" into rvc-qpr-dev 2020-09-15 23:00:29 +00:00
Yinglei Wang
953ba5c7ae Merge "Add accessibility manager enabled check in progressbar" into rvc-qpr-dev am: 7419f4d018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539313

Change-Id: Ifac7d07800c10f830d193395a885e6689b7b1eb1
 2020-09-15 22:27:28 +00:00
Yinglei Wang
7419f4d018 Merge "Add accessibility manager enabled check in progressbar" into rvc-qpr-dev 2020-09-15 21:56:24 +00:00
Hongwei Wang
80e875fad6 Log the application uid in PipUiEventLogger 
Regression from ag/12132203, we should log the application uid instead
of the running user id.

Bug: 168342514
Test: $ANDROID_HOST_OUT/bin/statsd_testdrive -terse 90
Merged-In: If5d1bfe9ce38ea21bb9e5e13f51622f732dd85b9
Change-Id: If5d1bfe9ce38ea21bb9e5e13f51622f732dd85b9
 2020-09-15 12:56:20 -07:00
jiabin
6e9cabd95e Add package name when creating AudioTrack. 
The package name will be used when starting external vibration. The
package name will be sent to vibrator service to check if the
application has the permission to start vibration,

Bug: 165910728
Bug: 162343845
Test: atest AudioTrackTest MediaPlayerTest
Test: start audio-coupled-haptic playback
Change-Id: I04b4711d11ab5f0f0716ea4c5e1c0f754fe834bb
Merged-In: I04b4711d11ab5f0f0716ea4c5e1c0f754fe834bb
 2020-09-15 18:03:17 +00:00
Treehugger Robot
bb076de201 Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9 am: 1f03dce40c am: 72098d8cb2 am: b0394a14a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652

Change-Id: I06ce9a0b23f4db854a38daf2f447c156ca8d1656
 2020-09-15 04:29:37 +00:00
Treehugger Robot
b0394a14a0 Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9 am: 1f03dce40c am: 72098d8cb2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652

Change-Id: I75f03419d174befc26136c60c4472ccef6cd93c6
 2020-09-15 04:06:25 +00:00
Treehugger Robot
72098d8cb2 Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9 am: 1f03dce40c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652

Change-Id: I8cf8a43ba98cf8458c072b436b47253b415ee737
 2020-09-15 03:24:49 +00:00
Treehugger Robot
1f03dce40c Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652

Change-Id: Ia094050b9e35f509f7c69dce48e8d95f156ea093
 2020-09-15 02:54:22 +00:00
Treehugger Robot
0a2c4f34c9 Merge "Fix navigation input consumer not working when first window is invisible" 2020-09-15 02:18:56 +00:00
Hall Liu
2ef041183d Expose Telecom constants for use in Telephony 
Expose Telecom constants that are used in Telephony in preparation for
mainline. Exposure is a combination of public/system -- those which made
sense for 3pty apps to access were made public.

Fixes: 168551099
Test: atest CtsTelecomTestCases
Change-Id: I688f04ba4ddf0498bad3463888fae71cdff2844a
 2020-09-14 18:37:44 -07:00
Louis Chang
f04f7e06c0 Merge "Fix NPE when starting activity while no focused task" into rvc-qpr-dev am: 6c6907db9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12567727

Change-Id: Id31c814325a83acc7d5798bb0b4e450b5a6a46ac
 2020-09-15 00:59:45 +00:00
Louis Chang
6c6907db9d Merge "Fix NPE when starting activity while no focused task" into rvc-qpr-dev 2020-09-15 00:38:58 +00:00
Jeff Sharkey
487d394296 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
 2020-09-15 00:13:08 +00:00
Jeff Sharkey
da7478b570 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c
 2020-09-14 23:42:34 +00:00
Jeff Sharkey
741c0a78cc Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
 2020-09-14 23:10:42 +00:00
Treehugger Robot
bc93881957 Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 am: e022945d69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I5725049a13c30e122e1f8b5e4e772b7431a4e32d
 2020-09-14 22:44:28 +00:00
Meng Wang
9af4f1d300 Merge "Skip notify celllocation of not really changed." am: 87a7929958 am: 96e61153a1 am: 584c1588a6 am: 217369162b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425373

Change-Id: Id74634de22b8580a1b73bb5709195e0cae2f8f59
 2020-09-14 22:41:13 +00:00
Ioannis Ilkos
a423f3888c Merge "Additional LMK diagnostic information" am: f3aeac8f09 am: 6a6ad9af99 am: 17af4e9b9b am: 6c3d76a967 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424810

Change-Id: Ia3d101e8c05dd664cc83561e59b51423b29d1c6e
 2020-09-14 22:40:15 +00:00
Jeff Sharkey
69e6f07347 Merge changes from topic "sep11" am: c0b288133a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8
 2020-09-14 22:36:51 +00:00
Bill Yi
e922c8a8a2 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 5c62f01896 -s ours am: fdf0be5a24 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
 2020-09-14 22:20:16 +00:00
Treehugger Robot
e022945d69 Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I6b4bb71859b54fde6a857680e880e3f389b20c74
 2020-09-14 22:03:18 +00:00
Meng Wang
217369162b Merge "Skip notify celllocation of not really changed." am: 87a7929958 am: 96e61153a1 am: 584c1588a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425373

Change-Id: I3a199c7d958a1cd8ba30c4ab9ff70ebc0e8a47a3
 2020-09-14 22:02:00 +00:00
Ioannis Ilkos
6c3d76a967 Merge "Additional LMK diagnostic information" am: f3aeac8f09 am: 6a6ad9af99 am: 17af4e9b9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424810

Change-Id: Ic5e6efa76873644a8fd73d626dcf12c608cd8287
 2020-09-14 21:56:11 +00:00
Jeff Sharkey
c0b288133a Merge changes from topic "sep11" 
* changes:
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
 2020-09-14 21:52:13 +00:00
Bill Yi
fdf0be5a24 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 5c62f01896 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
 2020-09-14 21:50:56 +00:00
TreeHugger Robot
636ba9b762 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ea029eeb8d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586397

Change-Id: Ifb26123f682ab838fc97000882e1de6e5cb47293
 2020-09-14 21:32:41 +00:00
Treehugger Robot
1d3e694b97 Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I70eb21c1ea9411974a1c07f6aaaf611760110c34
 2020-09-14 21:27:14 +00:00
Meng Wang
584c1588a6 Merge "Skip notify celllocation of not really changed." am: 87a7929958 am: 96e61153a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425373

Change-Id: I1b54aa49bf4f22a91cac210a139ec0c890c0cceb
 2020-09-14 21:25:08 +00:00
Ioannis Ilkos
17af4e9b9b Merge "Additional LMK diagnostic information" am: f3aeac8f09 am: 6a6ad9af99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424810

Change-Id: Ie90648747a83b97b79061d8d6af48df3f128c67d
 2020-09-14 21:24:45 +00:00
Bill Yi
5c62f01896 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
 2020-09-14 21:18:54 +00:00
TreeHugger Robot
ea029eeb8d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-14 21:10:08 +00:00
Treehugger Robot
3563eeb4ae Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: Ifd5f2a31ba5d3fbe9aaedca7b4c83d665cc61b9f
 2020-09-14 20:26:42 +00:00
Treehugger Robot
8ac6819c0e Merge "Replace 'whitelist' with 'allowlist'" 2020-09-14 19:53:04 +00:00
TreeHugger Robot
ed59e135d7 Merge "Add placeholder to priority onboarding" into rvc-qpr-dev am: 8f7a55c84e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12585825

Change-Id: I76484c6f9947df5f451bc51ecd1986b428d4536d
 2020-09-14 18:49:23 +00:00
Julia Reynolds
723a7028c7 Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev am: 8092c9b37d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12585704

Change-Id: If8fe5ff4c178a3173761f03112b0b8da67dc15fe
 2020-09-14 18:45:40 +00:00
TreeHugger Robot
b5078ea31d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 05ef028469 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12585606

Change-Id: Ib3cf8f48e6471f02af09c79ceec9f19afaa40419
 2020-09-14 18:36:28 +00:00
Julia Reynolds
71c18d2afc Replace 'whitelist' with 'allowlist' 
Change-Id: If7422064e59e6c055c9dae092ead298b81cf41e8
Test: atest
Bug: 161889253
Merged-In: I94a43c1c995052b034d8a5377786e1a15e4c9c59
 2020-09-14 18:29:23 +00:00
TreeHugger Robot
8f7a55c84e Merge "Add placeholder to priority onboarding" into rvc-qpr-dev 2020-09-14 18:15:22 +00:00
Meng Wang
96e61153a1 Merge "Skip notify celllocation of not really changed." am: 87a7929958 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425373

Change-Id: I2a9ccf5cc711411829c66f1a91715bb289e7a144
 2020-09-14 18:14:33 +00:00
Julia Reynolds
8092c9b37d Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev 2020-09-14 18:12:58 +00:00