Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,890 Commits 3 Branches 0 Tags
80fccc1daf4298d1b66c98dec77e3bddbcba9ef6
Commit Graph

105807 Commits

Author SHA1 Message Date
Sally Yuen
d74bcd3ca2 Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev am: 387529809d am: 9f924154dc am: 6c546f7350 am: 8dc832099f 
Change-Id: I3351d99c6e8df0e0426d607e9ab4400a1bc297cd
 2020-04-07 17:43:41 +00:00
TreeHugger Robot
2bf66482c8 Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a am: 8122a3938e am: e1e4f30329 am: f845a21c07 
Change-Id: Ia512ab896e77449bfbdc1a7e6fd54b4f573468a3
 2020-04-07 17:40:24 +00:00
Sally Yuen
9f924154dc Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev am: 387529809d 
Change-Id: Ie178f11ec5f52cd382396fb66077b01568e6aee9
 2020-04-07 17:21:29 +00:00
Sally Yuen
387529809d Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev 2020-04-07 17:06:04 +00:00
TreeHugger Robot
e1e4f30329 Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a am: 8122a3938e 
Change-Id: Id5a1562b6dad81374f76d98a89d7cdc5675ea399
 2020-04-07 17:04:53 +00:00
Automerger Merge Worker
37894bc45c Merge "Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev am: 77d7bcc124 am: 2873becff7" into rvc-d1-dev-plus-aosp am: a5d9ff7eb6 am: 1198e2a2ec 
Change-Id: I818ab389cd50935be5398904706c54e5df41739f
 2020-04-07 16:55:07 +00:00
Automerger Merge Worker
144d46be6c Merge "Merge "Fix exception handling in getState() binder cache" into rvc-dev am: 773cc6249e am: e46da26d89" into rvc-d1-dev-plus-aosp am: 01d981fa4c am: 9c281ec607 
Change-Id: If8c9cd7f05af509eb5188b0ea33a33e97be1acf0
 2020-04-07 16:54:29 +00:00
TreeHugger Robot
236c8f84a2 Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a 
Change-Id: Ic55bb7836e4d0e3ea2b0736ed5d73c043b7da2e4
 2020-04-07 16:49:59 +00:00
TreeHugger Robot
bd745f763a Merge "Expose Display.getType() via TestApi." into rvc-dev 2020-04-07 16:41:47 +00:00
TreeHugger Robot
2873becff7 Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev am: 77d7bcc124 
Change-Id: I31e4414d25e94b79d413f4346ee81d44183bf44d
 2020-04-07 16:29:18 +00:00
TreeHugger Robot
77d7bcc124 Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev 2020-04-07 16:26:53 +00:00
Lee Shombert
e46da26d89 Merge "Fix exception handling in getState() binder cache" into rvc-dev am: 773cc6249e 
Change-Id: I6ae7601efafdca3df5f1bdc6897a2796d3ef7fa8
 2020-04-07 16:25:31 +00:00
Lee Shombert
773cc6249e Merge "Fix exception handling in getState() binder cache" into rvc-dev 2020-04-07 16:18:11 +00:00
Linus Tufvesson
ad26d42668 Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f am: 52547c1250 am: 2529d6ebbc am: 5c39e176f9 
Change-Id: Ic5eec8bf93a8adf3706d1488930ae34e2ff282e0
 2020-04-07 12:27:34 +00:00
Linus Tufvesson
2529d6ebbc Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f am: 52547c1250 
Change-Id: I32295bf291bc857ffe65833a905ae410b2b355c4
 2020-04-07 12:01:20 +00:00
Linus Tufvesson
6a1c54f181 Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f 
Change-Id: Ifaa2e86e7477f1e1ef68e4f2c7ac4559caaea41d
 2020-04-07 11:52:25 +00:00
Linus Tufvesson
b66684981f Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev 2020-04-07 11:32:16 +00:00
Kholoud Mohamed
0d692957c1 Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev am: 5ec3cbac4c am: 0e434418d7 am: a5d68b63cc am: fbbc616ac5 
Change-Id: I1b36d3a4a1e5fe23fd9205ceb27f0591c963bbf9
 2020-04-07 10:41:40 +00:00
Fiona Campbell
2165655b50 Merge "Make PowerManagerService use float for brightness" into rvc-dev am: adbe11f6ac am: ce3e3d67cd am: 8b9e09f2e7 am: 6dc2bdfce5 
Change-Id: Ieed7fe0faf603df450e94c72c36344c547745f8a
 2020-04-07 10:40:18 +00:00
Kholoud Mohamed
0e434418d7 Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev am: 5ec3cbac4c 
Change-Id: I190c4e382efa6f421f660cf2e316807766dfa9d3
 2020-04-07 09:56:52 +00:00
Fiona Campbell
8b9e09f2e7 Merge "Make PowerManagerService use float for brightness" into rvc-dev am: adbe11f6ac am: ce3e3d67cd 
Change-Id: I4207fb71ecb127c670fc677dd9f7966f4885a9e9
 2020-04-07 09:56:36 +00:00
Santos Cordon
29d5b8f43e Expose Display.getType() via TestApi. 
Bug: 151124371
Test: atest android.display.cts.DisplayTest
Change-Id: Id3c25fe675c1fa2b0070cf95736c608315b5e26b
 2020-04-07 09:56:16 +00:00
Kholoud Mohamed
5ec3cbac4c Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev 2020-04-07 09:55:18 +00:00
Rhed Jao
62427df6f2 Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d49 am: 26870cfee0 am: cea5e93b4e am: c0c0d56ab5 
Change-Id: I109467145ee039e980df29a6e7272f8a05586c83
 2020-04-07 09:55:06 +00:00
Fiona Campbell
dcb31d4b7e Merge "Make PowerManagerService use float for brightness" into rvc-dev am: adbe11f6ac 
Change-Id: I411084fb6f60f0375a48ac4887eaf7bea2d7e33c
 2020-04-07 09:40:27 +00:00
Fiona Campbell
adbe11f6ac Merge "Make PowerManagerService use float for brightness" into rvc-dev 2020-04-07 09:36:09 +00:00
Chalard Jean
18eb7e5570 Merge "Fix a stupid NPE" into rvc-dev 2020-04-07 09:23:44 +00:00
Rhed Jao
26870cfee0 Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d49 
Change-Id: I2fb57d10566311020ca3b1c95076f371373289c7
 2020-04-07 09:05:32 +00:00
Rhed Jao
2aab1a4d49 Merge "Fix an exception while scanning apex packages" into rvc-dev 2020-04-07 08:49:48 +00:00
Tiger Huang
0426a33650 Update controls after addToDisplay/relayout before dispatching insets 
A window might request to control insets before it is added to WM and
expect the first dispatched WindowInsets as requested.

The first insets state returned from addToDisplay or relayout might be
not expected if the window just become thecontrol target in the
function.

With this CL, WM can return controls from addToDisplay and relayout, so
that the client can apply controls immediately, and update controlled
insets sources before dispatching the insets to the view hierarchy. This
enaures the insets dispatched are up-to-date.

Fix: 150756571
Test: atest WindowInsetsControllerTests RelayoutPerfTest
            WindowAddRemovePerfTest
Change-Id: Ib78c24beb7af5a54ad78935c3ddb260ef9645212
 2020-04-07 16:05:40 +08:00
Treehugger Robot
b2f183cd6e Fix a stupid NPE 
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I0d9b8cb8f8dcb587b9430b486b863efb9e9e77ef
Merged-In: I3e17211c03bc74426bf5e2e414ec322d73b0060b
(cherry picked from commit 827d7ceea1, aosp/1277595)
 2020-04-07 07:29:10 +00:00
Treehugger Robot
827d7ceea1 Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055 am: 2d9fd741ed am: 64bad37a81 am: 6141456633 
Change-Id: Ia64f68e32aef48c558e346d476bde89baa011b60
 2020-04-07 06:59:06 +00:00
Treehugger Robot
2d9fd741ed Merge "Fix a stupid NPE" am: 72746119bc am: 77ccd8d055 
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2
 2020-04-07 06:18:28 +00:00
Treehugger Robot
77ccd8d055 Merge "Fix a stupid NPE" am: 72746119bc 
Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265
 2020-04-07 06:02:50 +00:00
Treehugger Robot
72746119bc Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
TreeHugger Robot
034b7106c4 Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada am: fb7f470b5a am: a2ce73bd87 am: 958fd97525 
Change-Id: I7daa6a63311bc1fd03f937abe031bd1ed8e9cee0
 2020-04-07 04:48:36 +00:00
TreeHugger Robot
a2ce73bd87 Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada am: fb7f470b5a 
Change-Id: Ib1a9712eb4a447752a83c7606c561a0fb31a7085
 2020-04-07 04:08:32 +00:00
TreeHugger Robot
8bfdc107cc Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada 
Change-Id: I7cb2dde555ac4480d3ad18c675f3a6466184345b
 2020-04-07 03:58:21 +00:00
TreeHugger Robot
5eb9c8fada Merge "Store conversation requirement in a setting" into rvc-dev 2020-04-07 03:47:02 +00:00
Automerger Merge Worker
5d2bd7315a Merge "Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa am: c9e647b261" into rvc-d1-dev-plus-aosp am: e4e72b6309 am: 975453319d 
Change-Id: I7408b8bdf2b5f5637444f5f5edcd9ac5329ee763
 2020-04-07 02:11:39 +00:00
Selim Cinek
02c1e738b2 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa am: c9e647b261 
Change-Id: Icf9aa76842f573387abce5a23382112f3e0323f9
 2020-04-07 01:31:19 +00:00
Selim Cinek
8776260b29 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa 
Change-Id: I06c716ffda5d55888b4ad81130699de75ae1f98e
 2020-04-07 01:30:28 +00:00
Selim Cinek
35910cacaa Merge changes I76df6529,I99594ae9 into rvc-dev 
* changes:
  Fixed the heads up layout of conversations
  Fixed an issue where the conversation title was showing doubled
 2020-04-07 01:22:04 +00:00
Lee Shombert
81a3e1c578 Fix exception handling in getState() binder cache 
Bug: 153103051

A binder cache query function cannot compute a result based on any data
that is not known to the binder server.  If the code depends on local
data that can change, then invalidation will not work properly.

The getState() method returns OFF if the bluetooth service is
unavailable.  This computation now occurs in the getState() method,
outside of the binder cache query() method.

The query method converts RemoteExceptions to RuntimeExceptions.  Then,
the conversion is reversed in getState().  This double conversion is
needed because the cache query() method has no throw spec.

Test: Run 'atest BluetoothInstrumentationTests' with a special debug
image that enables binder cache VERIFY.  The test found no cache
inconsistencies.

Change-Id: I80db86f66d8b51fa94207824c8b15972a9066ef5
 2020-04-06 18:07:33 -07:00
Automerger Merge Worker
0ea0caa75c Merge "Merge "Make the system action API more clear with documentation" into rvc-dev am: 3987ae1ad8 am: 66f5db1e8e" into rvc-d1-dev-plus-aosp am: 9b9021593e am: 7ff11732a8 
Change-Id: I0248361a05abde1f23587d1e600db6f3ff491d49
 2020-04-07 01:01:15 +00:00
Sally Yuen
66f5db1e8e Merge "Make the system action API more clear with documentation" into rvc-dev am: 3987ae1ad8 
Change-Id: I1122208f77dad6e87b50171c7123bfb874217a52
 2020-04-06 23:58:06 +00:00
Sally Yuen
3987ae1ad8 Merge "Make the system action API more clear with documentation" into rvc-dev 2020-04-06 23:54:03 +00:00
Bernardo Rufino
4aef02d1e6 Merge "Wire user info and use user context for text toasts" into rvc-dev am: 2de79fb6fd am: ec0e67b052 am: 8499e595fe am: 95cc45f79f 
Change-Id: Ic2121b6fe6509537a61eedb46307e6bb094ee3ce
 2020-04-06 22:52:14 +00:00
Winson Chung
96bdffc2fb Merge "Revert "Keep task hidden until task appeared"" into rvc-dev am: be022550d8 am: 38e047f12e am: 912fc1b815 am: 51e8460f90 
Change-Id: Id309f919065b5e20e3abcaab2b10b1610812b37d
 2020-04-06 22:17:05 +00:00
Bernardo Rufino
ec0e67b052 Merge "Wire user info and use user context for text toasts" into rvc-dev am: 2de79fb6fd 
Change-Id: I0e814f94225d06edb4d973be300fbd2e515b4db9
 2020-04-06 22:12:26 +00:00