Commit Graph

486309 Commits

Author SHA1 Message Date
Nikita Ioffe
5b563218f9 [automerger skipped] Merge "ApexManager: Request apexservice only when needed" am: d96b6a6823 am: 66c4b034a5 -s ours
am skip reason: Change-Id I2d2173a692ec95a7a35b5a24ca466917e59c1da3 with SHA-1 91baff9782 is in history

Change-Id: Ie51107fb80d858bcaa026be2e113438150db8156
2020-05-19 12:27:30 +00:00
Nikita Ioffe
66c4b034a5 Merge "ApexManager: Request apexservice only when needed" am: d96b6a6823
Change-Id: If80283b5cb9e479fcfa8c4fdea21fa2da03266bc
2020-05-19 12:12:49 +00:00
Nikita Ioffe
d96b6a6823 Merge "ApexManager: Request apexservice only when needed" 2020-05-19 11:59:33 +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
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
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
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
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
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
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
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
85d6bd2b4a Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c
Change-Id: I051141c14e25172a9cad897b3d69bf9fbfeae9d9
2020-05-19 06:57:30 +00:00
TreeHugger Robot
1f9f62fe1a Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca
Change-Id: If0e8cf5e68bf9a9bead323bf289fd4d5a5999b7f
2020-05-19 06:56:57 +00:00
Suprabh Shukla
12cd148263 Merge "Fix unsuspend from dialog on secondary users" into rvc-dev am: 54f0b9e24c
Change-Id: Ieb0aaad01715d1666b652ab1cb4e9bee9eb742bc
2020-05-19 06:56:26 +00:00
Kyunglyul Hyun
d3eb223b7e Merge "Send last discovery preference to provider service" into rvc-dev am: c9d20f317d
Change-Id: I8b09e11ca3e84e44e4d7d8c73854b680ea38d1ac
2020-05-19 06:55:55 +00:00
TreeHugger Robot
0d23267a9c Merge "Change AtomicFile to use rename-into-place." into rvc-dev 2020-05-19 06:52:52 +00:00
TreeHugger Robot
1d867453ca Merge "add conversation flags to channel atom" into rvc-dev 2020-05-19 06:51:54 +00:00
Suprabh Shukla
54f0b9e24c Merge "Fix unsuspend from dialog on secondary users" into rvc-dev 2020-05-19 06:39:48 +00:00
Kyunglyul Hyun
5ff55ec278 Log info on system route provider
This CL logs provider info and session info of the system route provider
for debugging purpose.

Set DEBUG = true to gather logs for a while.

Bug: 156723680
Test: manually checking log
Change-Id: I4b020e951ff3b5bd7350cc733c822c702526e260
2020-05-19 15:36:40 +09:00
Kyunglyul Hyun
c9d20f317d Merge "Send last discovery preference to provider service" into rvc-dev 2020-05-19 06:32:57 +00:00
TreeHugger Robot
8c1c72eaa0 Merge "Update string for 3.5mm and usb audio device" into rvc-dev am: 29ab886b04
Change-Id: I27dfda3dc436a521eac42c416ba969da4ddbe722
2020-05-19 05:49:16 +00:00
TreeHugger Robot
29ab886b04 Merge "Update string for 3.5mm and usb audio device" into rvc-dev 2020-05-19 05:33:48 +00:00
Treehugger Robot
66b74f632f [automerger skipped] Merge "Add a test to check unusual home activities" am: c3076ed3b2 am: 74e9ef34c3 -s ours
am skip reason: Change-Id I6f190ae33fc9e724adc0e53d07107e9a1ae0291f with SHA-1 c8607a3a5b is in history

Change-Id: I7c1c8e592f24565bd8246ef1107790f7de57426f
2020-05-19 05:06:03 +00:00
Chen Xu
fd2b3141a9 Merge "allow CBR to write SMS database" into rvc-dev am: b44d6d6d48
Change-Id: I3c46cf90de5ca91a30fb603e8bc8f882bbb32b09
2020-05-19 05:01:16 +00:00
Treehugger Robot
74e9ef34c3 Merge "Add a test to check unusual home activities" am: c3076ed3b2
Change-Id: I0c388e6cf930297d99b8a2af448c4b8154c1a557
2020-05-19 04:49:37 +00:00
Chen Xu
b44d6d6d48 Merge "allow CBR to write SMS database" into rvc-dev 2020-05-19 04:41:50 +00:00
Treehugger Robot
c3076ed3b2 Merge "Add a test to check unusual home activities" 2020-05-19 04:31:35 +00:00
Treehugger Robot
4d6ac2e133 [automerger skipped] Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146 am: 2aabf5f792 -s ours
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1b9 is in history

Change-Id: I0dd072967f37835146a9e4199837946a36cb60b1
2020-05-19 04:00:00 +00:00
Mehdi Alizadeh
596e8fdccf Merge "Adds back inset scale value to main config.xml" into rvc-dev am: 799b92b2d5
Change-Id: I3202334042433a36151c6cdb8de2d702ebf67a25
2020-05-19 03:59:47 +00:00
Treehugger Robot
2aabf5f792 Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146
Change-Id: I29823d88ad54c5c8cf67ebc100d0d00f8c7282fd
2020-05-19 03:47:24 +00:00
Mehdi Alizadeh
799b92b2d5 Merge "Adds back inset scale value to main config.xml" into rvc-dev 2020-05-19 03:31:52 +00:00
Treehugger Robot
fa8eb3f146 Merge "Revert "Add a null home activity to Shell.apk"" 2020-05-19 03:29:23 +00:00
Treehugger Robot
824fab6ed3 Merge "TetheringServiceTest: test caller permission" am: 342a73c40c am: 085e1c80ec
Change-Id: Ia1c0ec986750a04290d3125882d00c18f4213ae7
2020-05-19 03:21:42 +00:00
Treehugger Robot
085e1c80ec Merge "TetheringServiceTest: test caller permission" am: 342a73c40c
Change-Id: I5064eb5e27d7803c0f86b75c391b56f1e3cb4d7d
2020-05-19 03:07:55 +00:00
Isaac Chen
498e571c9c Add a test to check unusual home activities
Framework's SystemUserHome and Shell's NullHome activities have no real
Home function and should only be used in bootable CSI products. They
should not exist or be enabled on normal products.

This test can help to find if they exist in the system without needing
to find them via Settings manually.

Bug: 149307007
Bug: 149780604
Bug: 154723738
Test: # On aosp_crosshatch with Shell's NullHome activity
      $ atest NullHomeTest
      ...
      arm64-v8a NullHomeTest
      ----------------------
      com.android.test.nullhome (1 Test)
      [1/1] com.android.test.nullhome.NullHomeTest#checkNullHome: FAILED (127ms)
      # On aosp_crosshatch without Shell's NullHome activity
      $ atest NullHomeTest
      ...
      arm64-v8a NullHomeTest
      ----------------------
      com.android.test.nullhome (1 Test)
      [1/1] com.android.test.nullhome.NullHomeTest#checkNullHome: PASSED (2ms)
Change-Id: I6f190ae33fc9e724adc0e53d07107e9a1ae0291f
Merged-In: I6f190ae33fc9e724adc0e53d07107e9a1ae0291f
(cherry picked from commit c8607a3a5b)
2020-05-19 10:59:30 +08:00
Philip P. Moltmann
74d33d3c1c Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev am: 088ef5e3ff
Change-Id: If7bed98ea906c6839bbf391e18cdd750e7e3976e
2020-05-19 02:56:11 +00:00
Philip P. Moltmann
088ef5e3ff Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev 2020-05-19 02:54:21 +00:00
Henry Fang
8e483795ad Merge "Added 1st atom for Tuner Metrics" into rvc-dev am: d026dffb65
Change-Id: If7c017982f1838da8af1ac78431ea0b3ab9b7182
2020-05-19 02:47:09 +00:00