Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
502,094 Commits 3 Branches 0 Tags
147eec6e02dc45bc4e758517b2b64b086c01e00e
Commit Graph

502094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
147eec6e02 Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 am: 2f5c9972c7 
Change-Id: I4804db79c819c3266fd72b7f9c2185ba2b2f43da
 2020-05-19 11:35:30 +00:00
TreeHugger Robot
ff084071d4 Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 am: 3b8cb03121 
Change-Id: I412915e653546f176ac2a913474a21e03ec00db4
 2020-05-19 11:35:01 +00:00
TreeHugger Robot
3b8cb03121 Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 
Change-Id: I549c9f9cd3745f03f50c9b44cc5b710c10994f40
 2020-05-19 11:16:34 +00:00
TreeHugger Robot
2f5c9972c7 Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 
Change-Id: I7a85fc2f3ae07f59a6d08ce13568546d4d308d18
 2020-05-19 11:16:05 +00:00
TreeHugger Robot
9cbcb69d59 Merge "Fix returning an occluded activity below boundary" into rvc-dev 2020-05-19 11:03:56 +00:00
Treehugger Robot
3a76e1685c Merge "Add an exported flag in integration tests manifest" am: 9bbf135cdc am: 0bf095409f am: 7bc2168f0b 
Change-Id: I57c34e4e4115159d72fe25a12367262febae46f9
 2020-05-19 10:48:43 +00:00
Treehugger Robot
7bc2168f0b Merge "Add an exported flag in integration tests manifest" am: 9bbf135cdc am: 0bf095409f 
Change-Id: I566ae57dc9a64636a72aba836f61d1686f5377c9
 2020-05-19 10:20:31 +00:00
Tony Huang
0680adf98f Merge "Set correct bounds when offset and expanded" into rvc-dev am: 44cb762e2b am: 9eba405eb9 
Change-Id: Idb790ad32a714f9726469e33463b8b4bb83fd0f2
 2020-05-19 09:58:51 +00:00
Treehugger Robot
0bf095409f Merge "Add an exported flag in integration tests manifest" am: 9bbf135cdc 
Change-Id: Iadfaca436895055de90e8018f881b07a6bab4bea
 2020-05-19 09:58:50 +00:00
Tony Huang
750b859149 Merge "Set correct bounds when offset and expanded" into rvc-dev am: 44cb762e2b am: 6d8f265a57 
Change-Id: I090b8018c827e5a42fa3aa7236e767d91f6b73c7
 2020-05-19 09:39:52 +00:00
Tony Huang
6d8f265a57 Merge "Set correct bounds when offset and expanded" into rvc-dev am: 44cb762e2b 
Change-Id: I802ab026cffe38dedb3152a0cae3db1822199bfe
 2020-05-19 09:37:49 +00:00
Tony Huang
9eba405eb9 Merge "Set correct bounds when offset and expanded" into rvc-dev am: 44cb762e2b 
Change-Id: Ib166aaafcf71850287532146d43311de32c31a99
 2020-05-19 09:37:26 +00:00
Calvin Pan
c395f18215 [automerger skipped] Merge "Update getSimCarrierId() document" am: 4e61079a4c am: 99fb86a51a -s ours am: f68a1c8aa6 -s ours 
am skip reason: Change-Id Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3 with SHA-1 18d70ab7b0 is in history

Change-Id: I83565b580ecb9f6971213027a091fb690174dfd2
 2020-05-19 09:37:04 +00:00
Treehugger Robot
9bbf135cdc Merge "Add an exported flag in integration tests manifest" 2020-05-19 09:32:39 +00:00
Calvin Pan
f68a1c8aa6 [automerger skipped] Merge "Update getSimCarrierId() document" am: 4e61079a4c am: 99fb86a51a -s ours 
am skip reason: Change-Id Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3 with SHA-1 18d70ab7b0 is in history

Change-Id: I1730cf15c61939dc88f92862ba1a39974833dd5a
 2020-05-19 09:17:14 +00:00
Tony Huang
44cb762e2b Merge "Set correct bounds when offset and expanded" into rvc-dev 2020-05-19 09:15:28 +00:00
Calvin Pan
99fb86a51a Merge "Update getSimCarrierId() document" am: 4e61079a4c 
Change-Id: I486690f2cb60629cd864d7acc919df3342a2f6ac
 2020-05-19 09:00:36 +00:00
Remi NGUYEN VAN
f089f9d8f8 Add an exported flag in integration tests manifest 
(partial cherry-pick of internal change:
I4457ff2bd466a4c56fed2570e110f251031c2385)

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Merged-In: I4457ff2bd466a4c56fed2570e110f251031c2385
Change-Id: I65a1ca1678048bbf09edc9a0485b673644c8109d
 2020-05-19 17:53:32 +09:00
Calvin Pan
4e61079a4c Merge "Update getSimCarrierId() document" 2020-05-19 08:40:12 +00:00
Automerger Merge Worker
98e1ad5ddd Merge "[automerger skipped] Merge "Rename ike module_lib stubs library" am: 82a632a55d am: a8805a5e09 -s ours am: 74c2e6487c -s ours" into rvc-d1-dev-plus-aosp 2020-05-19 08:31:48 +00:00
Paul Duffin
fe4023fd66 [automerger skipped] Merge "Rename ike module_lib stubs library" am: 82a632a55d am: a8805a5e09 -s ours am: 74c2e6487c -s ours 
am skip reason: Change-Id I39de5a766b2438b73cbdd8207d8879ee78ebc7e4 with SHA-1 c1a87ae3bc is in history

Change-Id: Ic79653c9f6065d3eb63f7b84b9e9d1663b806c23
 2020-05-19 08:31:39 +00:00
Automerger Merge Worker
a5a476e77c Merge "Merge "Log info on system route provider" into rvc-dev am: e54c3c811d am: 8e56019896" into rvc-d1-dev-plus-aosp 2020-05-19 08:31:33 +00:00
Kyunglyul Hyun
7f005bc55d Merge "Log info on system route provider" into rvc-dev am: e54c3c811d am: 6cd573b1cc 
Change-Id: I6991f9ebd268a1296f885f761c090f0affa06731
 2020-05-19 08:31:26 +00:00
Automerger Merge Worker
dd58b86f9d Merge "Merge "Fix brightness curve when user sets slider to min." into rvc-dev am: 4736a08273 am: 44a284444e" into rvc-d1-dev-plus-aosp 2020-05-19 08:31:12 +00:00
Kyunglyul Hyun
61c2171de7 Merge "Log info on system route provider" into rvc-dev am: e54c3c811d am: 8e56019896 
Change-Id: I6288bb6f5002e73a7c94bef663cf40fdf42c8167
 2020-05-19 08:31:08 +00:00
Fiona Campbell
1aa80df14f Merge "Fix brightness curve when user sets slider to min." into rvc-dev am: 4736a08273 am: 44a284444e 
Change-Id: I821d5406760c9b809a79dacf4fa6379084dc9c84
 2020-05-19 08:30:57 +00:00
Fiona Campbell
81d66e4615 Merge "Fix brightness curve when user sets slider to min." into rvc-dev am: 4736a08273 am: 66b80aa2a0 
Change-Id: I4a4d978ca81d7b74d74673676cf0b07f76bc85af
 2020-05-19 08:30:53 +00:00
Paul Duffin
74c2e6487c [automerger skipped] Merge "Rename ike module_lib stubs library" am: 82a632a55d am: a8805a5e09 -s ours 
am skip reason: Change-Id I39de5a766b2438b73cbdd8207d8879ee78ebc7e4 with SHA-1 c1a87ae3bc is in history

Change-Id: I1b561e7eb05b454efd9e7f35f1edc19ac01df884
 2020-05-19 08:30:45 +00:00
Louis Chang
62cdfe75f6 Fix returning an occluded activity below boundary 
WindowContainer#getActivity() was returning null if there was no
matching activity or hit the boundary. Since we were unable to
tell the difference between the two cases, we would continue looking
for a matching activity from higher level window containers.

Take below hierarchy for example, #getActivity() returns null if
the boundary was TopActivity. So, we were kept looking for the matching
activity from Task#2 and returns BottomActivity.

RootTask
  - Task#1
     - TopActivity
  - Task#2
     - BottomActivity

Bug: 156014697
Test: start activity from recents in split-secondary
Change-Id: Ic344e8c1c47e9fa05c4de60be8c6b30f75cdb0bc
 2020-05-19 16:23:15 +08:00
Kyunglyul Hyun
8e56019896 Merge "Log info on system route provider" into rvc-dev am: e54c3c811d 
Change-Id: Ib2295956b6ae0c0fd48a4f2c3717789ea462266b
 2020-05-19 08:13:35 +00:00
Paul Duffin
a8805a5e09 Merge "Rename ike module_lib stubs library" am: 82a632a55d 
Change-Id: Iacc47b0430d751d7dc19e23c48f1e89dd6490b66
 2020-05-19 08:13:26 +00:00
Kyunglyul Hyun
6cd573b1cc Merge "Log info on system route provider" into rvc-dev am: e54c3c811d 
Change-Id: I0b8d2409ff1787596a06b935d289f24234c8a134
 2020-05-19 08:13:24 +00:00
Fiona Campbell
66b80aa2a0 Merge "Fix brightness curve when user sets slider to min." into rvc-dev am: 4736a08273 
Change-Id: I0f53a3bdf2d53e112c1a67befb4eb9b2088470e4
 2020-05-19 08:13:08 +00:00
Fiona Campbell
44a284444e Merge "Fix brightness curve when user sets slider to min." into rvc-dev am: 4736a08273 
Change-Id: I43a00bd95d1f21091456afc04f6618c2762981b4
 2020-05-19 08:13:05 +00:00
Kyunglyul Hyun
e54c3c811d Merge "Log info on system route provider" into rvc-dev 2020-05-19 08:11:34 +00:00
Paul Duffin
82a632a55d Merge "Rename ike module_lib stubs library" 2020-05-19 07:55:45 +00:00
Fiona Campbell
4736a08273 Merge "Fix brightness curve when user sets slider to min." into rvc-dev 2020-05-19 07:50:42 +00:00
Tony Huang
5ebe019b41 Set correct bounds when offset and expanded 
This bug occured when offset during pip window expanding animation.
curBounds value is still not expand bounds values, fix it by reset
curBounds if it should be expanded status.

Fix: 154647477
Test: Move pip widnow near and above IME then touch it.
Change-Id: I3d0215b96643c7d33d8d922d41ac12cd6291270e
 2020-05-19 15:33:42 +08:00
TreeHugger Robot
dcd3f00807 [automerger skipped] Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 85d6bd2b4a -s ours 
am skip reason: Change-Id I5c4c438526a2aecdd2af18f71e16b41a05817c61 with SHA-1 b1a7706716 is in history

Change-Id: I557545cc586c2b23c8e3918639e122202981cc5b
 2020-05-19 07:16:26 +00:00
Automerger Merge Worker
f42be250eb Merge "Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 37f0ad1b43" into rvc-d1-dev-plus-aosp 2020-05-19 07:16:25 +00:00
TreeHugger Robot
ec3b9f7155 Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 37f0ad1b43 
Change-Id: I854c90d351f270fea3e065c3a1ebe52a46deaa1f
 2020-05-19 07:16:10 +00:00
TreeHugger Robot
e37a0499ca Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca am: 1f9f62fe1a 
Change-Id: Ic118b7685899857a7c552885095b4ca8d4d474fb
 2020-05-19 07:16:09 +00:00
Automerger Merge Worker
ca2d80a3c9 Merge "Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca am: df0222c013" into rvc-d1-dev-plus-aosp 2020-05-19 07:16:04 +00:00
TreeHugger Robot
2a13e833be Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca am: df0222c013 
Change-Id: I881eead19db01b5e16f9b102d78c487c357a71ba
 2020-05-19 07:15:59 +00:00
Automerger Merge Worker
a90765ff5e Merge "Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am: 54f0b9e24c am: 12cd148263" into rvc-d1-dev-plus-aosp 2020-05-19 07:15:58 +00:00
Suprabh Shukla
8fad06d021 Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am: 54f0b9e24c am: 12cd148263 
Change-Id: I354103eed4b9438faf5ce8f88b782c4354aa8bdc
 2020-05-19 07:15:48 +00:00
Suprabh Shukla
51941c6697 Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am: 54f0b9e24c am: 15de5b9eb5 
Change-Id: I0fe1b97664d0010c04779b1e2ce03dff3ab2affb
 2020-05-19 07:15:40 +00:00
Automerger Merge Worker
360d4cefa2 Merge "Merge "Send last discovery preference to provider service" into rvc-dev am: c9d20f317d am: d3eb223b7e" into rvc-d1-dev-plus-aosp 2020-05-19 07:15:34 +00:00
Kyunglyul Hyun
5d8ad840a1 Merge "Send last discovery preference to provider service" into rvc-dev am: c9d20f317d am: d3eb223b7e 
Change-Id: Ic2d74fbf833db9a41280eb83e07c144a0be43301
 2020-05-19 07:15:24 +00:00
Kyunglyul Hyun
857831cc1e Merge "Send last discovery preference to provider service" into rvc-dev am: c9d20f317d am: f1d45c1c49 
Change-Id: Icaf1d45d8ddd5033f9948d94174c5de7a8e03559
 2020-05-19 07:15:17 +00:00