Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508,839 Commits 3 Branches 0 Tags
5445a0f7aba9dcc04b246b538889ea3ebbd1aa1b
Commit Graph

508839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Meng Wang
87a7929958 Merge "Skip notify celllocation of not really changed." 2020-09-14 17:43:53 +00:00
Ioannis Ilkos
6a6ad9af99 Merge "Additional LMK diagnostic information" am: f3aeac8f09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424810

Change-Id: I6045fb5ecd45f58175393e9cc4b90c9a4064eae0
 2020-09-14 17:32:25 +00:00
Ioannis Ilkos
f3aeac8f09 Merge "Additional LMK diagnostic information" 2020-09-14 17:15:51 +00:00
Jeff Sharkey
10fc5bc904 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ic93fe142433b1aa9035a72031b80e875d14c9cc0
 2020-09-14 10:00:16 -06:00
Jeff Sharkey
9b37625b9b Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ia37d0180a2d687fa788eea854f7d89ad5faab593
 2020-09-14 10:00:14 -06:00
Jeff Sharkey
05e513d1c5 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I8aa4186f44957fc69aebceeeff1e6584b4eebd5a
 2020-09-14 10:00:12 -06:00
Jeff Sharkey
4172f8a62c Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: If75259aab72329f9f8b0e1972a96370ca5134e2c
 2020-09-14 10:00:10 -06:00
Jeff Sharkey
a8cec413b6 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
 2020-09-14 10:00:07 -06:00
Jeff Sharkey
16dd960d6f Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
 2020-09-14 10:00:05 -06:00
Jeff Sharkey
6516a83886 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ifce5239991e3b78dd4757712e3b88093ad7161f0
 2020-09-14 10:00:02 -06:00
Jeff Sharkey
705f6bec2d Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e
 2020-09-14 09:59:01 -06:00
arthurhung
941770b9c2 Fix navigation input consumer not working when first window is invisible 
The nav InputConsumer should be the top window without being related
to some window or it may be hidden if the window is not visible.

Test: atest com.android.server.wm
Test: atest WindowInsetsControllerTests
Bug: 167940326
Merged-In: I842114e68eaedaa008972a0a84c6b6394174f232
Change-Id: I842114e68eaedaa008972a0a84c6b6394174f232
(cherry picked from commit 74a9a609ac)
 2020-09-14 21:54:15 +08:00
Bill Yi
938d3bb1f5 Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-09-14 05:33:38 +00:00
Junyu Lai
8ea944d77a Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I19ffa2e0d367fecd0859e30c698612f3bdef99e4
 2020-09-14 03:52:33 +00:00
Junyu Lai
fc6fbde5df Merge "Handle lockdown VPN reset intent in ConnectivityService" 2020-09-14 03:14:51 +00:00
Bill Yi
75f38e0ff3 Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
 2020-09-13 07:58:42 -07:00
Meng Wang
75f256cb08 Skip notify celllocation of not really changed. 
Readability cleanup.

Bug: 145949028
Test: make
Change-Id: I668a95f8f30ef6fdf6493fbc37757f3f97f76c9f
 2020-09-12 02:21:44 +00:00
Treehugger Robot
1f2781c323 Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: Ied248c50c7c3150604390c6cd4734d81e050d6fd
 2020-09-11 19:09:26 +00:00
Treehugger Robot
70b20ee0b8 Merge "Quiet excessive logging of missing lambdas during preload" 2020-09-11 18:45:03 +00:00
Chris Wailes
5d29f49b7b Quiet excessive logging of missing lambdas during preload 
This patch will change the logging behavior in the Zygote such that
lambdas from the preload list that aren't found during Zygote
initialization will be counted and a summary provided at the end rather
than logging them each individually.  These missing lambdas will only be
logged for userdebug builds.

Test: Compared logs before and after
Bug: 163602260
Change-Id: I4cd11d626d7e4f365c55f8458aac20cd442638ed
Merged-In: I4cd11d626d7e4f365c55f8458aac20cd442638ed
 2020-09-11 10:55:02 -07:00
Treehugger Robot
927f0f7453 Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: If839338c8ea8a34afd896aac93e1118e8e2685bb
 2020-09-11 16:06:45 +00:00
Treehugger Robot
558a921d81 Merge "Update language to comply with Android's inclusive language guidance" 2020-09-11 15:57:59 +00:00