Tarandeep Singh
ec6e367c70
[automerger skipped] DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread am: 4b6acb4f39
...
am: 7b729fa242 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie7452f96fb7dfc5cff3ca29c88bc11cc072f369f
2019-11-26 12:16:21 -08:00
Tarandeep Singh
7b729fa242
DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
...
am: 4b6acb4f39
Change-Id: I4e7559656280d062544a37108800cb1e0db4c08c
2019-11-26 12:09:47 -08:00
Ruchir Rastogi
af0d27e87b
Merge "Added tests for new socket parsing"
2019-11-26 19:47:04 +00:00
Ruchir Rastogi
1fb525ecb0
Added tests for new socket parsing
...
New tests are guarded by NEW_ENCODING_SCHEME flag.
Test: bit statsd_test:* (passes both when the flag is turned on or off)
Change-Id: I429f478355e3e19941e4796706405ab0774e11d9
2019-11-26 11:43:42 -08:00
TreeHugger Robot
db644b952e
Merge "switch to new SkPathDirection enum"
2019-11-26 19:43:07 +00:00
TreeHugger Robot
b80612d1e2
Merge "UserSystemPackageInstaller uses user types"
2019-11-26 19:35:50 +00:00
TreeHugger Robot
da4ac9421d
Merge "Reset stack position when all the bubbles are removed"
2019-11-26 19:35:36 +00:00
Ruchir Rastogi
c12700206d
Merge "First pass at parsing new socket encoding scheme"
2019-11-26 19:30:30 +00:00
Roshan Pius
dc4c722068
Merge changes from topic "wifi_mainline_apex"
...
* changes:
Revert "Add a new wifi protection level"
Revert "Mainline wifi stack module"
Revert "WifiManager: Retrieve IWifiManager service lazily"
Revert "Sysui/WifiTracker: Changes to support late starting wifi service"
2019-11-26 19:22:17 +00:00
TreeHugger Robot
8312525fc4
Merge "Disable test broken on windows"
2019-11-26 19:19:43 +00:00
TreeHugger Robot
9f5f5cf52f
Merge "Handle adding EmbeddedWindows to host windows without an activity"
2019-11-26 19:07:28 +00:00
TreeHugger Robot
18d6217292
Merge "Fix doc of TOOL_TYPE_MOUSE."
2019-11-26 19:06:48 +00:00
TreeHugger Robot
98b1f9e851
Merge "Add fine tests to presubmits"
2019-11-26 19:03:28 +00:00
TreeHugger Robot
d6b38783fd
Merge "Rename PO Device IDs access -> Org Owned device"
2019-11-26 18:59:48 +00:00
TreeHugger Robot
ed4df3c2ad
Merge "Local TEST_MAPPING config for Platinum Suite"
2019-11-26 18:56:58 +00:00
Kweku Adams
dd6793952f
Merge "Fix typo in GuardedBy annotation."
2019-11-26 18:53:01 +00:00
Jeffrey Huang
788a208c03
Merge "Update some APIs to System and Public"
2019-11-26 18:39:52 +00:00
TreeHugger Robot
509428e9d7
Merge "Resolve boot unaware for suspension details activity"
2019-11-26 18:38:16 +00:00
Xiangyu/Malcolm Chen
a452be9d6f
Merge "Add System API to indicate whether physical SIM can be disabled."
2019-11-26 18:37:41 +00:00
Ryan Mitchell
e5981c075a
Disable test broken on windows
...
RegularExperssions is broken on Windows, disable this test while a
fix is being worked on.
Bug: 127793905
Test: wine aapt2.exe
Change-Id: Ic78a7f12b004d2e8dbf5d79c5b52f00ca0ceb9e9
2019-11-26 18:28:01 +00:00
Mady Mellor
d6edbca410
Reset stack position when all the bubbles are removed
...
Test: manual
1. have stack on right side of screen
2. dismiss the stack
3. get a new bubble
=> observe flyout animates from correct side of bubble
Bug: 145212704
Change-Id: Ia39ead10a8562a550a0eb069613f071ad53cd253
2019-11-26 10:27:42 -08:00
Jiashen Wang
da2d2c9ee9
[automerger skipped] Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7 am: c478e51e9b
...
am: 686df58861 -s ours
am skip reason: change_id I9e214607d4b791f11c8b688268fa1d58d66c23fc with SHA1 48ae8d52c3 is in history
Change-Id: If556cadd0fc5495f6343f7f6d0c5267d48c98ebc
2019-11-26 10:17:16 -08:00
Meng Wang
58a95cc4c2
Merge "Telephony: do not use hidden API ArrayUtils."
2019-11-26 18:11:37 +00:00
Jiashen Wang
686df58861
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7
...
am: c478e51e9b
Change-Id: If10fb4a795415bca2a0be8d334ba6e6e738c819a
2019-11-26 10:11:17 -08:00
Jiashen Wang
c478e51e9b
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
...
am: 936fd348f7
Change-Id: I5e915d62c31a05a4b6d6a1e61df814444e68fb37
2019-11-26 10:06:08 -08:00
Jiashen Wang
936fd348f7
Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
2019-11-26 17:56:55 +00:00
TreeHugger Robot
4da9fbe356
Merge "Secure FRP : Add a secure bit to know when the device is in secure FRP mode."
2019-11-26 17:56:45 +00:00
Garfield Tan
f2ef2a7fca
Fix doc of TOOL_TYPE_MOUSE.
...
It says it's set when the tool type is a mouse or trackpad, but the fact
is the tool type is TOOL_TYPE_FINGER on trackpads. Therefore remove
trackpad from Android doc.
Bug: 145135609
Test: N/A
Change-Id: Ife91ba032f9f0a8e7359425b415409ac609cdb25
2019-11-26 09:52:53 -08:00
Soonil Nagarkar
5bac2e86dd
Add fine tests to presubmits
...
Test: presubmits
Change-Id: Ia59f4a2486d1bd242ad35cda807455389664ebb5
2019-11-26 09:52:06 -08:00
Jayachandran Chinnakkannu
f6166035c4
Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87 am: c0ea72cf10
...
am: f72d5dbbf1
Change-Id: I8a7f28feb66265be2379beda7bc3fce732e4a294
2019-11-26 09:37:25 -08:00
Jayachandran Chinnakkannu
f72d5dbbf1
Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87
...
am: c0ea72cf10
Change-Id: I916e810b6350be9c1a6b24f2a652e05a1fa444fa
2019-11-26 09:31:33 -08:00
Jayachandran Chinnakkannu
c0ea72cf10
Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"
...
am: 9dcbd6de87
Change-Id: Iada558f0d94e08281b6e41825946e5b807618da6
2019-11-26 09:26:07 -08:00
Khaled Abdelmohsen
c55e093093
Merge changes Ic4587c5b,Ib7118228,I3411a0fb
...
* changes:
Include isHashedValue in rule structure
Support optional rule attributes in XML parser
Add rule component validations
2019-11-26 17:24:06 +00:00
Jayachandran Chinnakkannu
9dcbd6de87
Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"
2019-11-26 17:17:38 +00:00
Nataniel Borges
2447db9d17
Merge "Include janky runs on flicker rotation tests" am: 3341bbefea am: fcc1ef2d7d
...
am: e1367ec912
Change-Id: I4030670dd2f0068511dba0f4ccb4e49138b748d5
2019-11-26 08:48:29 -08:00
TreeHugger Robot
dc93f93008
Merge "Convert LockSettingsService tests to JUnit4"
2019-11-26 16:44:37 +00:00
Nataniel Borges
e1367ec912
Merge "Include janky runs on flicker rotation tests" am: 3341bbefea
...
am: fcc1ef2d7d
Change-Id: I5116803d89a5d85fc1a66fc6af6c0a91c824d178
2019-11-26 08:42:34 -08:00
Nataniel Borges
fcc1ef2d7d
Merge "Include janky runs on flicker rotation tests"
...
am: 3341bbefea
Change-Id: I05d509ca9ceb0d14725c25f90de4381fd1ff5241
2019-11-26 08:37:23 -08:00
Kweku Adams
7a6a23a6d0
Fix typo in GuardedBy annotation.
...
mPhenotypeFlagLock was missing the t.
Bug: 145156314
Test: N/A
Change-Id: If39e45eda8e912108a66e64a66cddec2409288e1
2019-11-26 08:30:56 -08:00
TreeHugger Robot
a9810f666f
Merge "Improvements on 'dumpsys activity' for users:"
2019-11-26 16:29:58 +00:00
Treehugger Robot
3341bbefea
Merge "Include janky runs on flicker rotation tests"
2019-11-26 16:29:45 +00:00
TreeHugger Robot
6225c24b3d
Merge "Filter preferred activities before committing to storage"
2019-11-26 16:10:53 +00:00
Rubin Xu
fc164dbd1a
Merge "Clean up AuthenticationToken interface and add some doc"
2019-11-26 16:06:54 +00:00
Khaled Abdelmohsen
1efff8745c
Include isHashedValue in rule structure
...
Bug: 141979167
Test: atest FrameworksServicesTests:RuleXmlSerializerTest
Test: atest FrameworksServicesTests:RuleXmlParserTest
Change-Id: Ic4587c5bcd65e0748c15655f79136eaa50a4eb1f
2019-11-26 15:37:00 +00:00
Khaled Abdelmohsen
e39fa0fd2f
Support optional rule attributes in XML parser
...
Bug: 143697198
Test: atest FrameworksServicesTests:RuleXmlParserTest
Change-Id: Ib7118228f325f8fcb88fa27cf88d48af0319e320
2019-11-26 15:36:14 +00:00
Khaled Abdelmohsen
5809a5f286
Add rule component validations
...
Bug: 141979167
Test: atest FrameworksServicesTests:RuleTest
Test: atest FrameworksServicesTests:AtomicFormulaTest
Test: atest FrameworksServicesTests:OpenFormulaTest
Change-Id: I3411a0fba37e7f3f9b9f6bbc5b2b895203bbd701
2019-11-26 15:34:45 +00:00
TreeHugger Robot
e60b9143e8
Merge "Creates a BootCompleteCache"
2019-11-26 15:31:20 +00:00
TreeHugger Robot
5ad3f1442c
Merge "Fix the API comments according to comments in http://ag/9554748 ."
2019-11-26 15:29:41 +00:00
Eran Messeri
18d21312ca
Rename PO Device IDs access -> Org Owned device
...
Repurpose the "Profile Owner was granted access to device identifiers"
to "Profile Owner of an Organization-owned device".
The old method now throws an exception, as it should not be called by
anything other than ManagedProvisioning (which is changed in this topic).
The new method now provides the functionality the old method provided,
and there's a new permission associated with it.
No functionality has been added or removed in this CL beyond that.
Bug: 138709470
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testDeviceIdAttestationForProfileOwner
Change-Id: I9914e8220213898d0c6b3499af8897e3a6f23819
2019-11-26 14:57:30 +00:00
Eran Messeri
804d53c6f2
Merge "Wiping and relinquishing org-owned devices"
2019-11-26 14:50:38 +00:00