Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
546,587 Commits 3 Branches 0 Tags
260d69c8bed107c6cd0bd80f38deedf813f2622f
Commit Graph

546587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
260d69c8be Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce85 am: 778d68307c am: 5d9a7cec42 am: d53a32fa04 
Change-Id: Ia9dfc6d5fc08c4efc59d79c0fbcae46ef2868af9
 2020-05-28 15:44:39 +00:00
TreeHugger Robot
9c05037d6c Merge "AudioService: mute music during BT A2DP device switch" into rvc-dev am: 82938719a8 am: 24983e2dab am: 20836716e1 am: 32db5c4eb6 
Change-Id: Iffb94081db0263d24b96aeb80a8e6b39d18dc3de
 2020-05-28 15:43:56 +00:00
Louis Chang
d53a32fa04 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce85 am: 778d68307c am: 5d9a7cec42 
Change-Id: I7951a00faacfe8ea692affd5d81956f42a2ecb6c
 2020-05-28 15:24:26 +00:00
TreeHugger Robot
32db5c4eb6 Merge "AudioService: mute music during BT A2DP device switch" into rvc-dev am: 82938719a8 am: 24983e2dab am: 20836716e1 
Change-Id: Ia1e2688dafd3718a4519b3cb859e570de6ac8e96
 2020-05-28 15:24:10 +00:00
Pavel Grafov
0f15d2ab29 Merge "Update notification strings for personal app suspension." into rvc-dev am: 2c1335c4db am: dd7dda7bbe am: 0107dc0992 am: fb5e0b1654 
Change-Id: I1dc8b5eba1272562702236b24765a7989a2f098c
 2020-05-28 15:19:09 +00:00
TreeHugger Robot
5d3e74c786 Merge "Moving product specific strings to product directory" into rvc-dev am: 99984950b8 am: cd0b195138 am: 199f6a9ad2 am: d0f7041bde 
Change-Id: Ia7aab6907563d5edbcca6d68d0f0de6d51a13891
 2020-05-28 15:18:47 +00:00
TreeHugger Robot
d8d2505483 Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf7941324 am: 790e618c22 am: 347da37a6b am: 3e0312f4e0 
Change-Id: Id68d7aed6c7b6051a879daa5700935322823509b
 2020-05-28 15:18:23 +00:00
Louis Chang
5d9a7cec42 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce85 am: 778d68307c 
Change-Id: I9a3a54a479e051deb8119635d45740c36c533bc5
 2020-05-28 15:08:13 +00:00
TreeHugger Robot
20836716e1 Merge "AudioService: mute music during BT A2DP device switch" into rvc-dev am: 82938719a8 am: 24983e2dab 
Change-Id: Ib0ddae7aaa7bbdd7bfd1acd1512230b1b0d8b916
 2020-05-28 15:07:56 +00:00
Pavel Grafov
fb5e0b1654 Merge "Update notification strings for personal app suspension." into rvc-dev am: 2c1335c4db am: dd7dda7bbe am: 0107dc0992 
Change-Id: Ia471e0923baba1e846be37c920cce295445c345b
 2020-05-28 14:58:25 +00:00
TreeHugger Robot
d0f7041bde Merge "Moving product specific strings to product directory" into rvc-dev am: 99984950b8 am: cd0b195138 am: 199f6a9ad2 
Change-Id: Ic4d9bfe2cf6b36229124fcdf9d7c145f3cb88d65
 2020-05-28 14:58:05 +00:00
TreeHugger Robot
3e0312f4e0 Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf7941324 am: 790e618c22 am: 347da37a6b 
Change-Id: I71a1c768374dda38eac4d15ab1b6b312346c0924
 2020-05-28 14:57:50 +00:00
Louis Chang
778d68307c Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce85 
Change-Id: I3e07281119d0aad8b3c66186f5bcdbce1e32bd77
 2020-05-28 14:48:08 +00:00
TreeHugger Robot
24983e2dab Merge "AudioService: mute music during BT A2DP device switch" into rvc-dev am: 82938719a8 
Change-Id: I30b5489c1c38c308b94a90955d47d04f3bd3e6cb
 2020-05-28 14:47:54 +00:00
Louis Chang
77db95ce85 Merge "Revert "Only add divider when it need to show"" into rvc-dev 2020-05-28 14:45:46 +00:00
Pavel Grafov
0107dc0992 Merge "Update notification strings for personal app suspension." into rvc-dev am: 2c1335c4db am: dd7dda7bbe 
Change-Id: I02ed3a17b32259f7efb4e151e03c005ba17f7439
 2020-05-28 14:41:43 +00:00
TreeHugger Robot
199f6a9ad2 Merge "Moving product specific strings to product directory" into rvc-dev am: 99984950b8 am: cd0b195138 
Change-Id: Ibbcc8d8f0fd0e5d1a01e47bdecdb44a57c42cf3f
 2020-05-28 14:41:15 +00:00
TreeHugger Robot
347da37a6b Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf7941324 am: 790e618c22 
Change-Id: I114768a8311a2669ca5fccc4c19f4b3c87e64a08
 2020-05-28 14:40:39 +00:00
TreeHugger Robot
5e9aa288cb [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 26a62c0df6 -s ours am: 2e25f7d779 -s ours am: fecd438f40 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 8de903184a is in history

Change-Id: I294f3289c72bdb85b3015432f38e6b96bc863f73
 2020-05-28 14:33:32 +00:00
Fabian Kozynski
c395188dc7 Merge "Fix ripple in GA" into rvc-dev am: bad91c0ea4 am: 7a2d48a813 am: 2e42318fa8 am: 9c0cdf7bd5 
Change-Id: Ic7b89663ef0b78ae1db8acbdb834f2b6524fad61
 2020-05-28 14:33:17 +00:00
TreeHugger Robot
82938719a8 Merge "AudioService: mute music during BT A2DP device switch" into rvc-dev 2020-05-28 14:32:29 +00:00
Pavel Grafov
dd7dda7bbe Merge "Update notification strings for personal app suspension." into rvc-dev am: 2c1335c4db 
Change-Id: I3b505bc835ef23b4171c0159c373988be931e625
 2020-05-28 14:25:43 +00:00
TreeHugger Robot
cd0b195138 Merge "Moving product specific strings to product directory" into rvc-dev am: 99984950b8 
Change-Id: I09a5192ef544adf26c8c30599857cd81f4f7f227
 2020-05-28 14:25:30 +00:00
TreeHugger Robot
790e618c22 Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf7941324 
Change-Id: Iaf7e3cc9acef95cda544440c7d99ea4ff3e08e02
 2020-05-28 14:25:16 +00:00
TreeHugger Robot
fecd438f40 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 26a62c0df6 -s ours am: 2e25f7d779 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 8de903184a is in history

Change-Id: I9600de066578322aed052b74960f122f0f8ca3e1
 2020-05-28 14:18:34 +00:00
Fabian Kozynski
9c0cdf7bd5 Merge "Fix ripple in GA" into rvc-dev am: bad91c0ea4 am: 7a2d48a813 am: 2e42318fa8 
Change-Id: I8ac752b5d1cec43cd8a98936e0439365ceaa4770
 2020-05-28 14:18:13 +00:00
Pavel Grafov
2c1335c4db Merge "Update notification strings for personal app suspension." into rvc-dev 2020-05-28 14:18:09 +00:00
TreeHugger Robot
99984950b8 Merge "Moving product specific strings to product directory" into rvc-dev 2020-05-28 14:17:03 +00:00
TreeHugger Robot
9cf7941324 Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev 2020-05-28 14:14:15 +00:00
TreeHugger Robot
2e25f7d779 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 26a62c0df6 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 8de903184a is in history

Change-Id: I308d86910c877702cda6d0f3093c66700c68a862
 2020-05-28 13:59:38 +00:00
Fabian Kozynski
2e42318fa8 Merge "Fix ripple in GA" into rvc-dev am: bad91c0ea4 am: 7a2d48a813 
Change-Id: Ie4f2aab5c24a1b4aee087c213b64ac297d583c69
 2020-05-28 13:59:22 +00:00
Paul Duffin
26e3437954 [automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: a18aafb151 am: 3695e78759 am: c8ef8b098e -s ours 
am skip reason: Change-Id If5c115f482751f9f4b5f047e9e401a18e36799ef with SHA-1 d448b15158 is in history

Change-Id: I5aa60f50fbfa39808dd7a3d54e261fa60e1e43f0
 2020-05-28 13:59:18 +00:00
Paul Duffin
c8ef8b098e Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: a18aafb151 am: 3695e78759 
Change-Id: Ic769e747c5090c905a1e723b5123880cf6eb726a
 2020-05-28 13:38:47 +00:00
TreeHugger Robot
26a62c0df6 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 8de903184a is in history

Change-Id: I9e2e5b2862a2a381c437669427c0ef02a3905dc4
 2020-05-28 13:31:18 +00:00
Fabian Kozynski
7a2d48a813 Merge "Fix ripple in GA" into rvc-dev am: bad91c0ea4 
Change-Id: I1086314960f475f7be9fd33c00e5255d96b45f5c
 2020-05-28 13:30:51 +00:00
Paul Duffin
3695e78759 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: a18aafb151 
Change-Id: Ic732265e75f86e9aa5c523ae1ced9ff2b92e220a
 2020-05-28 13:24:45 +00:00
Eran Messeri
058139f2f9 Merge "Only notify when admin enables location for the user" into rvc-dev am: 35f33f427e am: 9b1c4372c5 am: 3d33dcc021 am: bdd4b4af39 
Change-Id: I6c0e25e7cc1a7c4fec2825c9b34471b536fab69c
 2020-05-28 13:24:25 +00:00
TreeHugger Robot
c119ee1ed2 Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev 
* changes:
  NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
  NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
 2020-05-28 13:16:54 +00:00
Fabian Kozynski
bad91c0ea4 Merge "Fix ripple in GA" into rvc-dev 2020-05-28 13:15:57 +00:00
Paul Duffin
a18aafb151 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f 
Change-Id: Icf8a3b8eed7e85065d54f2f48d8cb6f05974de00
 2020-05-28 13:09:48 +00:00
Eran Messeri
bdd4b4af39 Merge "Only notify when admin enables location for the user" into rvc-dev am: 35f33f427e am: 9b1c4372c5 am: 3d33dcc021 
Change-Id: I65ed1b207779bb46f7adeb9248f42217d7d04ab0
 2020-05-28 13:09:30 +00:00
Eran Messeri
3d33dcc021 Merge "Only notify when admin enables location for the user" into rvc-dev am: 35f33f427e am: 9b1c4372c5 
Change-Id: Ia94fb6184c62fad9baec94ee6695f49cacb849fd
 2020-05-28 12:57:28 +00:00
Paul Duffin
5e988a656f Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev 2020-05-28 12:54:25 +00:00
Eran Messeri
9b1c4372c5 Merge "Only notify when admin enables location for the user" into rvc-dev am: 35f33f427e 
Change-Id: I8b1add452d1c08d61edb7350924dcd15beb591dd
 2020-05-28 12:44:53 +00:00
Adrian Roos
2e2631572a Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags 
Test: atest android.server.wm.WindowInsetsAnimationTests#testAnimationCallbacks_withLegacyFlags
Fixes: 155955734
Change-Id: Idb35218abb4e17688bfb985abb97ae739a60136b
 2020-05-28 14:33:38 +02:00
Eran Messeri
35f33f427e Merge "Only notify when admin enables location for the user" into rvc-dev 2020-05-28 12:32:21 +00:00
Narayan Kamath
84b94b6070 Merge "Revert ResolverActivity changes associated with browseables." into rvc-dev am: 101fcc5746 am: cc9f819283 am: 656fe5fe04 am: 63fa86de39 
Change-Id: Ib2aafb4011fb2550ad747944f698c04cae2c3703
 2020-05-28 12:08:21 +00:00
Anton Hansson
cef5916975 Merge "Enable annotations for framework stubs" into rvc-dev am: 517edf62c8 am: 3dda766d21 am: a3f065ec19 am: 4a47e76d3e 
Change-Id: If0972f1ce7da721cd46cfe6e59567db720456bc1
 2020-05-28 12:08:07 +00:00
Narayan Kamath
67369782e7 Merge "Revert ResolverActivity changes associated with browseables." into rvc-dev am: 101fcc5746 am: cc9f819283 am: 31ecfdb0db am: 4927ad4c6c 
Change-Id: Ia712810be0f4e12799bd18f915030a539db07698
 2020-05-28 12:07:35 +00:00
Anton Hansson
c13dbeb00d Merge "Enable annotations for framework stubs" into rvc-dev am: 517edf62c8 am: 3dda766d21 am: 25acaceabf am: 079f249a59 
Change-Id: Iee7aa9a53d58499df6f0d6b5b355162b1f1c4dc3
 2020-05-28 12:07:21 +00:00