Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
505,580 Commits 3 Branches 0 Tags
2601b17b2b811c00a4c0e88dbe9212d28154466c
Commit Graph

105541 Commits

Author SHA1 Message Date
Jorim Jaggi
2601b17b2b Merge "Initialize sourceless insets with Insets.NONE" into rvc-dev am: fe2228aa89 am: ce24761577 am: d4485fe330 am: b954419290 
Change-Id: Ica3c28957e8fa51cba071cc29c48cac55a286e5d
 2020-04-02 19:17:01 +00:00
Winson Chiu
5f1c53480d Merge changes from topic "revert-10921255-revert-10403399-pkg-override-label-icon-DCRMJNYAKW-YCXMFEDIAG" into rvc-dev am: bd24ca3daf am: 0905856ed1 am: 4d64895998 am: 60dbc0f8d5 
Change-Id: I5b132209c50e2dd5b6d879cd9f45951a2fb5561b
 2020-04-02 19:01:58 +00:00
Automerger Merge Worker
0ad9a08a22 Merge "Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d am: 7adae30ac0" into rvc-dev-plus-aosp am: 8eec601b70 am: 84eddfdf5d am: 7da8379f85 
Change-Id: Ie61a241b2b80ea12c60a58c5e26b5af34e02a5ef
 2020-04-02 18:52:50 +00:00
junyulai
6c7bef3064 [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39 am: 094a459dcf am: 87d385a28e am: 3265830ec9 
Change-Id: I6397ef1dd483d0d2f62cfcf044fa6b89b3c39982
 2020-04-02 18:36:24 +00:00
Feng Cao
f8347366d2 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac am: 8ab445a7a9 am: 3f185c6881 am: 6c8b4417cc 
Change-Id: Iff11cae258441c0adbccc16bf28b2ccc2f61d252
 2020-04-02 18:34:58 +00:00
Mehdi Alizadeh
440beb1e84 Merge "Adds ShortcutServiceInternal#isSharingShortcut()" into rvc-dev am: 6ddae0c22b am: 51222c1636 am: 8cb5a8df40 am: f981a9f356 
Change-Id: Ia3aba81260112c69025f518bae683619659031e7
 2020-04-02 18:03:20 +00:00
Alex Buynytskyy
602789f139 Merge changes from topic "LOADER_USAGE_STATS" into rvc-dev am: 50e0244012 am: 3ea7adf007 am: c63d068021 am: 6366444f0c 
Change-Id: Ic49b31f0282cd147549f6bf2da9bf37b131ec880
 2020-04-02 17:57:55 +00:00
Rob Carr
b0469c1ec8 Merge changes I98b51b43,I03cb69e1 into rvc-dev am: f2f056ef71 am: a77f60313d am: 698a536015 am: 3174ed17d3 
Change-Id: Ia96143157d57b95c79405abe66924fb024fe2883
 2020-04-02 17:38:07 +00:00
Winson Chung
28ddd25ebd Merge "Move always-on-top to the callers" into rvc-dev am: 331cd1a9c9 am: 5b84b22e92 am: 239af0f826 am: 51297e1a51 
Change-Id: I90d0c6eedaa38ed0fd216a4d13e70799e142d5e9
 2020-04-02 17:06:44 +00:00
Automerger Merge Worker
17390b4a33 Merge "Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b am: 9716d62b4d" into rvc-d1-dev-plus-aosp am: aa5088485c am: aef5228d68 
Change-Id: I84c387f3c2f7c774c236a5786f5602dc997c3cbe
 2020-04-02 17:06:10 +00:00
Fredrik Roubert
bfac2397b0 Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 am: d13a70de57 am: f030962cce am: 54dcd832a3 am: 53fa3b60e2 
Change-Id: I1d778c43033fad0357d5c92128b2dd013ed06b3f
 2020-04-02 16:59:48 +00:00
Steven Moreland
da8de74def Merge "Document linkToDeath behavior on object cleanup." am: 2608950d10 am: f276d0b74d am: 179ba84aab am: c5b095ba54 am: ea5c684c97 
Change-Id: I4af6894a1f085ac3c43c796929cb4dc29b4bc451
 2020-04-02 16:59:23 +00:00
Leon Scroggins
2eee1b57b5 Merge "Replace ImageDecoder.sApiLevel with a SystemApi helper" 2020-04-02 14:00:10 +00:00
Jorim Jaggi
d4485fe330 Merge "Initialize sourceless insets with Insets.NONE" into rvc-dev am: fe2228aa89 am: ce24761577 
Change-Id: I9bd3d0543b2c8c017789c8eb23e12e5782be348c
 2020-04-02 11:11:38 +00:00
Jorim Jaggi
fe2228aa89 Merge "Initialize sourceless insets with Insets.NONE" into rvc-dev 2020-04-02 10:55:38 +00:00
Neil Fuller
1fde0596bb Make manual suggestions synchronous/return result 
Modify the suggestManual...() methods on TimeDetector and
TimeZoneDetector to be synchronous, and have them return true/false to
indicate if the call "succeeded". This is being done before adding more
calls that will be used by apps like SettingsUI; generally all calls
that are user facing and could conceivably fail should return
success/failure information and therefore need to happen synchronously.

Test: atest services/tests/servicestests/src/com/android/server/timedetector/
Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/
Bug: 140712361
Change-Id: I5b6b7fb5af2ffe88392b2ca8d1e8fff2a187521b
 2020-04-02 11:18:04 +01:00
Winson Chiu
4d64895998 Merge changes from topic "revert-10921255-revert-10403399-pkg-override-label-icon-DCRMJNYAKW-YCXMFEDIAG" into rvc-dev am: bd24ca3daf am: 0905856ed1 
Change-Id: Ib944bef9a3b5c21f21a670b3043b16354eb4c51f
 2020-04-02 08:26:47 +00:00
Winson Chiu
bd24ca3daf Merge changes from topic "revert-10921255-revert-10403399-pkg-override-label-icon-DCRMJNYAKW-YCXMFEDIAG" into rvc-dev 
* changes:
  Add mPackageParserCallback assignment in TestParams constructor
  Revert "Revert "Allow overriding the label and icon of a MainCom..."
  Revert^2 "Add test constructor to PackageManagerService"
 2020-04-02 07:49:40 +00:00
Lorenzo Colitti
ca9ba5c158 Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d am: 7adae30ac0 
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0
 2020-04-02 04:50:41 +00:00
Lorenzo Colitti
7adae30ac0 Merge "Only apply VPN isolation if it's fully routed" am: 4fa9742c4d 
Change-Id: I5267b567e1b9babe3bc95d2984262dc864681a2d
 2020-04-02 04:32:04 +00:00
Lorenzo Colitti
4fa9742c4d Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
junyulai
87d385a28e [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39 am: 094a459dcf 
Change-Id: Ice87baf7326ad333b611a348b3bceebe71d0858e
 2020-04-02 03:11:14 +00:00
Feng Cao
3f185c6881 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac am: 8ab445a7a9 
Change-Id: I03b161351e49dae841521f8262d9d48a11ad7e8e
 2020-04-02 03:09:53 +00:00
Feng Cao
8e26f69e31 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac 
Change-Id: I95434c190744f62b1981fb624a6bed0200fba910
 2020-04-02 03:07:56 +00:00
Feng Cao
257aa916ac Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev 2020-04-02 02:47:01 +00:00
junyulai
094a459dcf [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 am: 7bb7d94d39 
Change-Id: I388b1d3677d362da2595739913880efa9a643a03
 2020-04-02 02:40:42 +00:00
junyulai
7bb7d94d39 [SP26.2] add a method in NetworkStats that removes empty entries am: fb16574069 
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
 2020-04-02 02:21:20 +00:00
Mehdi Alizadeh
8cb5a8df40 Merge "Adds ShortcutServiceInternal#isSharingShortcut()" into rvc-dev am: 6ddae0c22b am: 51222c1636 
Change-Id: I4f1d7a851c6ba02aabe39cb859f38be1f7657e81
 2020-04-02 02:10:11 +00:00
Junyu Lai
6baf734a9b Merge changes from topic "sp26-networkstats-cts" 
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
 2020-04-02 02:00:59 +00:00
Mehdi Alizadeh
332e716155 Merge "Adds ShortcutServiceInternal#isSharingShortcut()" into rvc-dev am: 6ddae0c22b 
Change-Id: I62efc1b83c1c81f5303430e203c29caf3f6b0772
 2020-04-02 01:50:22 +00:00
Mehdi Alizadeh
6ddae0c22b Merge "Adds ShortcutServiceInternal#isSharingShortcut()" into rvc-dev 2020-04-02 01:32:13 +00:00
Alex Buynytskyy
3ea7adf007 Merge changes from topic "LOADER_USAGE_STATS" into rvc-dev am: 50e0244012 
Change-Id: I543c9a2c62c3468494537db9b0bb9d9e04acee6f
 2020-04-02 00:48:17 +00:00
Alex Buynytskyy
50e0244012 Merge changes from topic "LOADER_USAGE_STATS" into rvc-dev 
* changes:
  Checking LOADER_USAGE_STATS before enabling read logs.
  Revert "Update the current API dump"
 2020-04-02 00:36:26 +00:00
Alex Buynytskyy
5e860ba105 Checking LOADER_USAGE_STATS before enabling read logs. 
Bug: b/152633648
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: Ic747a51b97b785c627c95bddecc6834ef602ff30
 2020-04-02 00:31:41 +00:00
Rob Carr
a77f60313d Merge changes I98b51b43,I03cb69e1 into rvc-dev am: f2f056ef71 
Change-Id: Ic9bb3b2372b17f48ca71ad4fff8a5002f9facbe3
 2020-04-01 22:51:28 +00:00
Rob Carr
f2f056ef71 Merge changes I98b51b43,I03cb69e1 into rvc-dev 
* changes:
  InsetAnimationThreadControlRunner: Don't copy controls
  InsetsSourceConsumer: Release directly
 2020-04-01 22:43:59 +00:00
Priyank Singh
43b604f9c5 Merge "Add attr allowClickWhenDisabled for the new API View#setAllowClickWhenDisabled" 2020-04-01 22:43:25 +00:00
Mehdi Alizadeh
f802f3777e Adds ShortcutServiceInternal#isSharingShortcut() 
Bug: 152346206
Test: atest com.android.server.pm.ShortcutManagerTest1
Change-Id: I86bea32215a24aa5c7be3a5bc4bbf704b39baea0
 2020-04-01 21:49:44 +00:00
Winson Chung
239af0f826 Merge "Move always-on-top to the callers" into rvc-dev am: 331cd1a9c9 am: 5b84b22e92 
Change-Id: I3312cc55ac420af685885c48e335f9c7b41ebe91
 2020-04-01 21:11:56 +00:00
Selim Cinek
a5f56c1aad Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b am: 9716d62b4d 
Change-Id: Iab69600a392fcc0ea6f499862a2626a6ed69636e
 2020-04-01 21:11:29 +00:00
Winson Chung
6ae09b17e2 Merge "Move always-on-top to the callers" into rvc-dev am: 331cd1a9c9 
Change-Id: I52819f351419515c423a92ae894dd4d4a33c6d04
 2020-04-01 21:09:38 +00:00
Winson Chung
331cd1a9c9 Merge "Move always-on-top to the callers" into rvc-dev 2020-04-01 21:02:26 +00:00
Selim Cinek
0bf6b0d2e8 Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b 
Change-Id: Ie73e27447a8c10156a7b9ea925e5dc23da6e4ea9
 2020-04-01 20:59:19 +00:00
Jorim Jaggi
6f2ccea9f9 Initialize sourceless insets with Insets.NONE 
...in order to make WindowInsets.equals consider source missing
and source not providing insets the same.

Fixes: 152822955
Test: InsetsAnimationTest
Change-Id: I31cb0278f45c38fb788d4f2bdefb1a13b6870216
 2020-04-01 22:00:39 +02:00
Feng Cao
59b682f5cd Define custom equals method for bundles in the inline APIs 
Test: atest android.view.inputmethod.cts
Bug: 152811052

Change-Id: I15051493bb37f05b579b16d6e7fee36b05ab10cc
 2020-04-01 12:46:15 -07:00
Fredrik Roubert
f030962cce Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 am: d13a70de57 
Change-Id: I0a0099a4fdc1bcdf76d097313f4f938f3bf9049b
 2020-04-01 19:21:38 +00:00
Fredrik Roubert
d13a70de57 Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 
Change-Id: I08418b82a81bc153061544ff09afb19daec9125d
 2020-04-01 19:21:13 +00:00
Steven Thomas
3c4fbe9686 Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc126 am: 745b38486b am: a29a64c17e am: 8cef774d81 
Change-Id: Id79432b343d9b15852434f1619de7151c9c3645e
 2020-04-01 19:21:13 +00:00
Steven Moreland
179ba84aab Merge "Document linkToDeath behavior on object cleanup." am: 2608950d10 am: f276d0b74d 
Change-Id: Id8621528331802054b5979edfb4a09c3e44fba61
 2020-04-01 19:21:11 +00:00
Winson Chiu
8e865ecd06 Revert "Revert "Allow overriding the label and icon of a MainCom..." 
Revert submission 10921255-revert-10403399-pkg-override-label-icon-DCRMJNYAKW

Reason for revert: Re-submit broken change with included fix.
Reverted Changes:
Ic5c719cbb:Revert "Allow overriding the label and icon of a M...
Id9d37e661:Revert "Add test constructor to PackageManagerServ...

Bug: 113638339

Change-Id: I4f5247f528f62c175bd34f0e4cb16c9456c8afe4
 2020-04-01 19:17:53 +00:00