Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
529,175 Commits 3 Branches 0 Tags
1663ccb25470c0c55289a1a1d718e222e0a1798e
Commit Graph

529175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
1663ccb254 Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab am: ab666813e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: Ifbd457664d92a547359f92fe91ba203bb58ed1ef
 2020-09-17 04:43:30 +00:00
Robert Chou
53aa756a06 Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc am: 8e9f6c8db1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: Iee41dc3a0540cfd39014a47db43e2ca2c1592e32
 2020-09-17 04:43:11 +00:00
Lucas Lin
ab666813e2 Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: I2a97dd14b8534a634f8b260d8775abd64eace2d1
 2020-09-17 02:24:20 +00:00
Robert Chou
8e9f6c8db1 Merge "Ringtone uri should add type query" am: 96d98a9fad am: caf558ecdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: I52e40353b3890676704884c5fd7fbe73016c9c3c
 2020-09-17 02:24:09 +00:00
Lucas Lin
5445a0f7ab Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426656

Change-Id: I0a9cdc959def7dc157494bc30b311b09d0fcea53
 2020-09-17 01:36:15 +00:00
Lucas Lin
8f10e0097b Merge "Rename mUserHandle to mUserId for better understanding" 2020-09-17 01:30:27 +00:00
Robert Chou
caf558ecdc Merge "Ringtone uri should add type query" am: 96d98a9fad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426651

Change-Id: I06a7b6696daebe999e90887bcc5dcb645a683002
 2020-09-17 01:25:06 +00:00
Robert Chou
96d98a9fad Merge "Ringtone uri should add type query" 2020-09-17 01:00:58 +00:00
Amit Mahajan
a23339f3b7 [automerger skipped] Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f am: d397780a38 -s ours 
am skip reason: Change-Id I626f871b64d50127feece80f018272e51ad1c66c with SHA-1 715073fc69 is in history

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

Change-Id: Iad2e1a2c79337cd9ebdf112156f473867f92fd5b
 2020-09-16 23:34:42 +00:00
Amit Mahajan
d397780a38 Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371060

Change-Id: I342f10760b799b934c5b33b1a0afb81816a312d2
 2020-09-16 22:58:32 +00:00
Amit Mahajan
eeeb5b506f Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371060

Change-Id: I241c839930f98ba838e3e30f900fa42a64663df2
 2020-09-16 22:22:09 +00:00
Amit Mahajan
2c3e56fce6 Merge "Fixed that data connections not tearing down when APN set id changes" 2020-09-16 21:11:50 +00:00
Leon Scroggins
226c477959 Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f am: b9d7c9ec52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I4c704fd27885b0b7b0d62e4e4d29f89d461d879d
 2020-09-16 19:06:58 +00:00
Leon Scroggins
b9d7c9ec52 Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I85afba6ce0d53370031c089f30e2af69df02f8c9
 2020-09-16 17:01:31 +00:00
Leon Scroggins
3a62413c4f Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968

Change-Id: I9fe8e278e8efb2fe00206dd413b08e6cffc8291c
 2020-09-16 16:06:45 +00:00
Leon Scroggins
efca2d56f1 Merge "ImageDecoder: Use AssetFileDescriptor's length" 2020-09-16 13:44:28 +00:00
Michael Plass
3ae8858d77 Merge "Update wifi OWNERS (base)" am: 630c5dd1c7 am: a3144f871b am: 71b958536e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: Ic72ab456c694ceb230d091595161db5d615712e7
 2020-09-16 12:55:51 +00:00
Michael Plass
71b958536e Merge "Update wifi OWNERS (base)" am: 630c5dd1c7 am: a3144f871b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: I36c03a0f47db8616e7d811ca1235d316f48297a3
 2020-09-16 12:29:56 +00:00
Michael Plass
a3144f871b Merge "Update wifi OWNERS (base)" am: 630c5dd1c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427553

Change-Id: Ic3b4e9c75523ee447a2c4e7aaf6722e89fa6ac75
 2020-09-16 11:57:36 +00:00
Michael Plass
630c5dd1c7 Merge "Update wifi OWNERS (base)" 2020-09-16 11:02:40 +00:00
Treehugger Robot
dce36b5b50 Merge "Remove a useless method" am: 3edc1b50bf am: 77b171be6f am: 107dd4f936 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I0d32f54bf0c10afa33d59292291806a482af159c
 2020-09-16 07:46:30 +00:00
Treehugger Robot
107dd4f936 Merge "Remove a useless method" am: 3edc1b50bf am: 77b171be6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: Idbf3ffa12027bbfb3f68ad867f61eebbd54af9f5
 2020-09-16 07:17:46 +00:00
Treehugger Robot
77b171be6f Merge "Remove a useless method" am: 3edc1b50bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I371245204277fa58c986370b503b379e97a0706e
 2020-09-16 06:36:15 +00:00
Treehugger Robot
3edc1b50bf Merge "Remove a useless method" 2020-09-16 05:58:01 +00:00
wan.li
3b25df9ad3 Ringtone uri should add type query 
When only DisplayName is used to query the default ringtone,
the query may be incorrect, because other types of ringtones
may contain resources with the same name.

It should not happen that other types of ringtone uri are set
as the default ringtone of the current type by mistake.

Bug: 168431815

Change-Id: Ic37f879a658379179dc53715fa016631bb7309d9
 2020-09-16 02:50:23 +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
Hall Liu
9fcb2819d0 Merge "Expose Telecom constants for use in Telephony" 2020-09-16 00:05:18 +00:00
Leon Scroggins III
d172a0cff8 ImageDecoder: Use AssetFileDescriptor's length 
Bug: 166069819
Test: ImageDecoderTest (cts)

The contained asset may only be a subset of the AssetFileDescriptor.
SkWebpCodec reads the entire stream into a contiguous block of memory.
(This is because libwebp does not provide a streaming API for creating
its demuxer.) If the AssetFileDescriptor contains data after the webp
file, this wastes memory. In some cases, there may be a *lot* of data
after the webp file, so this can use too much memory, particularly on
low memory devices.

Merged-In: I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55
Change-Id: I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55
 2020-09-15 15:52:38 +00:00
Michael Plass
2d7adeed89 Update wifi OWNERS (base) 
Bug: 168325766
Test: builds
Change-Id: I74b44fbe9f8da58a84695d5b27a961ae1636ea02
 2020-09-15 08:02:51 -07:00
lucaslin
9429531062 Rename mUserHandle to mUserId for better understanding 
- mUserHandle is not good for understanding.
- In fact, mUserHandle or userHandle in Vpn.java means user id.

Bug: 168576152
Test: atest FrameworkNetTests
Change-Id: I3ec8ee21f45283b400ea451ade31be7c6c24102b
 2020-09-15 08:53:28 +00:00
Chalard Jean
5f385ba620 Remove a useless method 
No seriously ?

Test: builds
Change-Id: Ie1508ce50a39e4c69a4b238067bab1e83ddaf019
 2020-09-15 16:18:56 +09: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
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
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
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
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