Commit Graph

465105 Commits

Author SHA1 Message Date
Joe Onorato
758bc85bf7 Merge changes from topic "b_144187174"
* changes:
  Remove this TEST_MAPPING file until I can figure out what this error means
  Make libincident into a stable C API.
2020-02-06 03:09:52 +00:00
TreeHugger Robot
f6849b2726 Merge "Add the implementation of get all packages in IPackageManagerNative.aidl." 2020-02-06 03:07:19 +00:00
Mehdi Alizadeh
7a2b81b7d3 Merge "Adds locus Id to ShortcutQuery to find shortcuts based on LocusId" 2020-02-06 02:50:38 +00:00
Mehdi Alizadeh
03127b010f Merge "Adds LauncherApps#ShortcutChangeCallback" 2020-02-06 02:49:55 +00:00
TreeHugger Robot
de25f7f1ff Merge "Adds the FloatingContentCoordinator." 2020-02-06 02:49:51 +00:00
Yunfan Chen
6ced1bff86 Merge "Do not write recycled icon to TaskDescription parcel" 2020-02-06 02:46:45 +00:00
TreeHugger Robot
53a8d4a2ce Merge "Remove obsolete Settings unit tests" 2020-02-06 02:40:02 +00:00
TreeHugger Robot
817b75a2f0 Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" 2020-02-06 02:31:42 +00:00
Danning Chen
ef3abba378 Merge "Fix the NPE when reading the call log or SMS if a device has multiple user profiles" 2020-02-06 02:21:30 +00:00
Etan Cohen
e5455e171b Merge changes from topic "wificond"
* changes:
  [WIFICOND][API] Replace capability BitSet by an int
  [WIFICOND][API] Update documentation
  [WIFICOND][API] Simplify initialization sequence
  [WIFICOND][API] Documentation clarification for AP callback registration
  [WIFICOND][API] Clarify time usage
2020-02-06 02:15:19 +00:00
Automerger Merge Worker
a2f5cbeb4d Merge "use apex_test for test apexes" am: bef404385c am: 88f3565a92 am: 4077775ef3
Change-Id: I4547a1e0a9ddd380553a472fab4899d257de3506
2020-02-06 02:11:47 +00:00
TreeHugger Robot
1b36dea7fc Merge "Enable freezer logs" 2020-02-06 02:07:10 +00:00
TreeHugger Robot
d51f8c5639 Merge "Move compat behavior in #onPipRequested to ActivityThread" 2020-02-06 02:00:57 +00:00
Automerger Merge Worker
4077775ef3 Merge "use apex_test for test apexes" am: bef404385c am: 88f3565a92
Change-Id: Ib33ff9fc78d960c11daf3544d0f83a03afcbfebb
2020-02-06 01:57:48 +00:00
TreeHugger Robot
e7e3b214c0 Merge "Reduce amount of appop work location does" 2020-02-06 01:54:29 +00:00
Automerger Merge Worker
88f3565a92 Merge "use apex_test for test apexes" am: bef404385c
Change-Id: Ib09ac45b88d9f64e66954700aed6a14db1cfedc4
2020-02-06 01:48:02 +00:00
TreeHugger Robot
5d52ce9bfa Merge "Update LocalBluetoothProfile api" 2020-02-06 01:47:18 +00:00
Howard Ro
18108f0a82 Merge "Create REGISTER_STATS_PULL_ATOM permission" 2020-02-06 01:45:23 +00:00
Automerger Merge Worker
ea25aa5d95 Merge changes I5a01d709,I1b7da86d am: 95d9c6164b am: 3e07b3a7f3 am: f45c114c4e
Change-Id: Icf066ed0634f01597d6c4273131d9ed67f0935f9
2020-02-06 01:44:23 +00:00
Jiyong Park
bef404385c Merge "use apex_test for test apexes" 2020-02-06 01:36:27 +00:00
Pinyao Ting
b28e39bec8 Merge "fix a typo in comment" 2020-02-06 01:35:04 +00:00
Automerger Merge Worker
f45c114c4e Merge changes I5a01d709,I1b7da86d am: 95d9c6164b am: 3e07b3a7f3
Change-Id: If6905874c40756157d5c6aa33db38964c6dd5a6d
2020-02-06 01:24:55 +00:00
TreeHugger Robot
1059d5a169 Merge "Use native boot namespace for freezer" 2020-02-06 01:22:33 +00:00
TreeHugger Robot
c9853809e1 Merge "Pass back frame event stats" 2020-02-06 01:11:19 +00:00
Automerger Merge Worker
3e07b3a7f3 Merge changes I5a01d709,I1b7da86d am: 95d9c6164b
Change-Id: I7079ddf41c18c3c073e3a0234fbd15f40a339315
2020-02-06 01:10:49 +00:00
TreeHugger Robot
39dcf2a148 Merge "Update permission check to use Statsd's uid" 2020-02-06 01:04:32 +00:00
Henry Fang
846e0a0b20 Merge "Add permission define to access overridePid of Media Resource Manager Service." 2020-02-06 01:02:30 +00:00
TreeHugger Robot
047c213d14 Merge "Adjust blur radius" 2020-02-06 01:01:10 +00:00
Benedict Wong
95d9c6164b Merge changes I5a01d709,I1b7da86d
* changes:
  Add Skeleton Ikev2VpnRunner class
  Add VpnRunner abstract class
2020-02-06 00:55:05 +00:00
Automerger Merge Worker
08b29115c8 Merge "Fix serialization issue of ExternalVibration" into qt-dev am: 02824fc2a9 am: 74c9ad17c2 am: 82c9b74407
Change-Id: I05968bb8a3d75f2e6670fe2e6342f95adb8e52d4
2020-02-06 00:53:14 +00:00
Automerger Merge Worker
82c9b74407 Merge "Fix serialization issue of ExternalVibration" into qt-dev am: 02824fc2a9 am: 74c9ad17c2
Change-Id: I12075c1d870a032990cfc0c78911a2dd5abc6170
2020-02-06 00:43:36 +00:00
Rob Carr
7752715c06 Merge "TaskOrganizer: Implement lifetime changes for testing." 2020-02-06 00:37:58 +00:00
TreeHugger Robot
cd24019091 Merge changes I1e5ea680,I8366010a
* changes:
  Introduce NotifBindPipeline (2/2)
  Introduce NotifBindPipeline (1/2)
2020-02-06 00:34:36 +00:00
TreeHugger Robot
2b3feba757 Merge "Interface for notification collection being used" 2020-02-06 00:25:44 +00:00
Automerger Merge Worker
74c9ad17c2 Merge "Fix serialization issue of ExternalVibration" into qt-dev am: 02824fc2a9
Change-Id: I196882cf82416b3d4e84c487bd94b925f719dc1d
2020-02-06 00:25:37 +00:00
TreeHugger Robot
ce409f3638 Merge "Update UidRecord when capability changes." 2020-02-06 00:20:42 +00:00
Chris Ye
02824fc2a9 Merge "Fix serialization issue of ExternalVibration" into qt-dev 2020-02-06 00:12:49 +00:00
Mehdi Alizadeh
6d5c82ed04 Merge "Fixes NPE when calling getPackage on a null shortcut" 2020-02-06 00:09:11 +00:00
Marin Shalamanov
3d35344faa Merge "Update default and active mode when new modes are added." 2020-02-06 00:07:43 +00:00
Automerger Merge Worker
0e2e3d80f2 [automerger skipped] Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31 am: 82f3668df5 am: 3452551dd1 -s ours
am skip reason: Change-Id I3dabcb853ebbd648b20d97b446db11476780be25 with SHA-1 93fcf24a23 is in history

Change-Id: I33872df76ef1fdd93c579cc406f264554517537e
2020-02-06 00:05:21 +00:00
Joe Onorato
d1d1aeb46a Remove this TEST_MAPPING file until I can figure out what this error means
Missing test_suite setting for test: GtsIncidentConfirmationTestCases, test group: presubmit, TEST_MAPPING file path: [frameworks/base/libs/incident]
Missing test_suite setting for test: GtsIncidentManagerTestCases, test group: presubmit, TEST_MAPPING file path: [frameworks/base/libs/incident]

Test: treehugger
Change-Id: I8c3f5a2ff1e22be764ae4cc42223a29f10a3480e
2020-02-05 15:58:59 -08:00
Automerger Merge Worker
3452551dd1 Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31 am: 82f3668df5
Change-Id: I4d8626c985f9021e03d4c2c0ef1adb18c142ca05
2020-02-05 23:53:05 +00:00
Automerger Merge Worker
82f3668df5 Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." am: 53ae130d31
Change-Id: I3f24b00947dbdba84c0b1a1f1c6828ea0f7a22f9
2020-02-05 23:41:32 +00:00
Automerger Merge Worker
07bba6d0c2 [automerger skipped] Merge "Add isEuiccSupportedCountry system API to EuiccManager" am: e37c8d26c2 am: c9076a7e8d am: 1089f083be -s ours
am skip reason: Change-Id Ic94a2d2c771fd1ec2e5899d9e0428bb70cde4249 with SHA-1 2c6545a1c5 is in history

Change-Id: I3f7a2316bee9b866859cbd149b8bb99c87fff87b
2020-02-05 23:37:58 +00:00
Automerger Merge Worker
9ba2f23018 [automerger skipped] Merge "Add rtp silence detection and inactivity detection to call quality" am: 5867fb23e9 am: 2c41763bc1 am: 4f592c2d8e -s ours
am skip reason: Change-Id Idc9b2077f73a05542ab531e67b41545022ec25a1 with SHA-1 57269c53f9 is in history

Change-Id: Ie6478e2a6a762158406659c32523fb66f2036354
2020-02-05 23:37:29 +00:00
Xiangyu/Malcolm Chen
53ae130d31 Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." 2020-02-05 23:31:51 +00:00
Songchun Fan
f11362df4f Merge "dup fds before closing them" 2020-02-05 23:29:03 +00:00
Automerger Merge Worker
1089f083be Merge "Add isEuiccSupportedCountry system API to EuiccManager" am: e37c8d26c2 am: c9076a7e8d
Change-Id: I8c54577542c213c8e50a67e1f4f59208fcb308c1
2020-02-05 23:28:46 +00:00
Automerger Merge Worker
c9076a7e8d Merge "Add isEuiccSupportedCountry system API to EuiccManager" am: e37c8d26c2
Change-Id: If6a77de86e04ff7a2dacddbe92698f602f6b15a5
2020-02-05 23:23:46 +00:00
Automerger Merge Worker
4f592c2d8e Merge "Add rtp silence detection and inactivity detection to call quality" am: 5867fb23e9 am: 2c41763bc1
Change-Id: I2e17c975aae692f586ea00feef4a537ebc168992
2020-02-05 23:23:24 +00:00