Commit Graph

84949 Commits

Author SHA1 Message Date
Chiachang Wang
f6bfc13b5f Merge "Add more test case and some clean up" am: a0e4349794
am: 2a93421b60

Change-Id: Iaf66ebc89188f0100bdc95fcc42574a4b1ad14fe
2019-02-26 00:14:00 -08:00
Chiachang Wang
2a93421b60 Merge "Add more test case and some clean up"
am: a0e4349794

Change-Id: I14c74464877d58f74abab8914ac85aae435b7938
2019-02-25 23:31:43 -08:00
Treehugger Robot
a0e4349794 Merge "Add more test case and some clean up" 2019-02-26 06:20:24 +00:00
Nathaniel R. Lewis
01aa9e8157 Merge "Fixes for touchpad capture" am: c5ea003bbb
am: 6f72ed8b27

Change-Id: I07e2ce2f93a8ed920879759873af4f0f40191b87
2019-02-25 20:27:54 -08:00
Chiachang Wang
95489ca49e Add more test case and some clean up
Bug: 120452078
Test: atest NetworkStackTests
Change-Id: Ifb981ccdaa7818bf2bebec98e91979007222910b
2019-02-26 11:32:18 +08:00
Tyler Gunn
0b0d3022ee Merge "Change data types on CallIdentification API." am: 016982ae2f
am: d29c7d63a2

Change-Id: I902f8f14350567973ab007b407bfe72ef90c2b2d
2019-02-25 11:00:58 -08:00
Neil Fuller
efaa3e6801 Merge "Update RulesManagerService after APEX files" am: ee15067180
am: 7421a00bb0

Change-Id: I86bba886037d93723957a33f913f6fa0c05e8b0f
2019-02-25 10:34:33 -08:00
Nandana Dutt
a973019596 Merge "Add a new error code for disallowing concurrent bugreports" am: 2badc1e434
am: 1ae35be3e3

Change-Id: I7440be8e4605466958d072dd977e0019f13b2193
2019-02-25 10:20:50 -08:00
Sooraj Sasindran
0acab502a0 Merge "Allow UiAutomation to adopt the shell permission indentity" am: 9f0115bb6e
am: 178684530b

Change-Id: If21a26f16b8c88f1dab56ac7fa7a804a1e9077b0
2019-02-25 09:25:50 -08:00
Howard Chen
dbfc7f4ef2 Merge "Add feature flag for Dynamic Android" am: c1e55147c9
am: 3e51385d47

Change-Id: I2372a014bfe359dd84d43c0ddff8c662ce8684fd
2019-02-25 08:56:18 -08:00
Paul Duffin
70828b499b Merge "Update backwards compatibility support for android.test.base" am: 617e556477
am: f4dfe50594

Change-Id: I9ad5a85431e0ea747fff208430b3a61826674b62
2019-02-25 08:43:04 -08:00
Nathaniel R. Lewis
6f72ed8b27 Merge "Fixes for touchpad capture"
am: c5ea003bbb

Change-Id: I27c8f1f58d7824fc57b273d36a01135d78e2b4ec
2019-02-22 17:50:31 -08:00
Treehugger Robot
c5ea003bbb Merge "Fixes for touchpad capture" 2019-02-23 01:27:07 +00:00
Xin Li
f90d07b1b3 Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-23 00:39:16 +00:00
Qasid Sadiq
24f953a6c2 Merge "Revert "Fix a11y cache correctness bug"" into pi-dev
am: 987ec033ab

Change-Id: I00d421256cbda478bf413a2195f14787d09d133c
2019-02-22 15:55:50 -08:00
Tyler Gunn
016982ae2f Merge "Change data types on CallIdentification API." 2019-02-22 21:13:28 +00:00
Tyler Gunn
b3bdb7c36c Change data types on CallIdentification API.
Per API council feedback update the call identification name, details,
description and app name to use CharSequence.

Test: Update apis, run tests.
Bug: 123241094
Merged-In: I42df17506535c1dd598ffd61a44cb0d0440b8159
Change-Id: I42df17506535c1dd598ffd61a44cb0d0440b8159
2019-02-22 11:18:05 -08:00
Neil Fuller
ee15067180 Merge "Update RulesManagerService after APEX files" 2019-02-22 18:32:13 +00:00
Neil Fuller
a1ae02519d Update RulesManagerService after APEX files
Context
=======

The "time zone updates via APK" feature was implemented in O-MR1 to enable
devices to take time zone updates via an APK update and without needing
an OTA. RulesManagerService is an important part of the time zone updates via
APK feature. When RulesManagerService was implemented things were simple; there
was a copy of time zone data in /system. A new (optional) copy was introduced
in /data that could be managed / updated by the RulesManagerService.
Since there were only two copies the /system copy was referred to as the
"system" data.

With the introduction of the runtime APEX and time zone data APEX things
have become more complicated. Android devices can have time zone data in
several places:

1 The copy in /system/usr/share/zoneinfo/ is partially complete and remains
  for legacy usecases, e.g. binaries that "know" about the /system path and
  cannot be updated, or binaries which run before /apex paths are mounted.

2 The copy in /apex/com.android.runtime/ is a complete set of time zone
  data that can be used by libraries on the device.

3 The copy in /apex/com.android.tzdata/ is the "overlay" copy for use when
  the time zone data APEX can be updated. For devices that can take APEX
  updates it will be present and is expected to start with the same version as
  present in /apex/com.android.runtime. Note: Nothing in the code *requires*
  this copy to be present but it is expected to be present in most cases.

RulesManagerService is being kept around for devices that may not have the
capability of updating their APEX files but which still want to update time
zone data without taking an OTA. It is assumed that RulesManagerService will
*only* be turned on in these situations and *not* when the time zone
data in /apex/com.android.tzdata/ might actually be updated independently of
the copy in /apex/com.android.runtime/.

The RulesManagerService therefore adds the fourth copy of the data that *could*
be present:

4 The copy /data/misc/zoneinfo/ managed by RulesManagerService.

Important libraries / binaries on device know about all 4 copies and
prioritize them in order 4, 3, 2, 1. i.e. the libraries will use the
first copy of data found in that order.

In scenarios where RulesManagerService is disabled, 4 will not be present
and therefore 3 will be used (or 2 if 3 is also not present).

In scenarios where RulesManagersService is enabled, 4 is present iff an
APK update has been received. It is assumed that *if* /apex/com.android.tzdata/
is present, it contains the same version of tz data as in
/apex/com.android.runtime/, will never be updated, and can therefore
be ignored by RulesManagerService.

The changes
===========

This commit and others in the same topic do the following:

1) Change RulesManagerService references to "system" data to "base" data in a
   valiant attempt to limit confusion until it can be removed.
2) Switch RulesManagerService over from using the data in
   /system/usr/share/zoneinfo/ as base data to the data in
   /apex/com.android.runtime/.  As part of this change, the RulesManagerService
   can now use the tz_version file to identify the version of tzdb in "base"
   rather than reading the header of the tzdata file, so that is done
   here too.
3) Update imports neccessary to meet pre-upload check requirements.

Note: tzdatacheck, an independent binary that manages time zone data
after OTA, was updated to use /apex/com.android.runtime/ instead of
/system/usr/share/zoneinfo/ in commit c6a2737e0861472d1726ed472708d7762ab1e802.

Bug: 119293618
Bug: 113373927
Test: atest FrameworksCoreTests:android.app.timezone
Test: atest FrameworksServicesTests:com.android.server.timezone
Test: CTS: run cts-dev -m CtsLibcoreTestCases -t libcore.libcore.timezone.ZoneInfoDBTest
Test: CTS: run cts-dev -m CtsLibcoreTestCases -t libcore.libcore.icu.TimeZoneIntegrationTest
Change-Id: Idabe245c7ad337938c202b1796ce9d89ec68bbd6
2019-02-22 15:43:39 +00:00
Nandana Dutt
2badc1e434 Merge "Add a new error code for disallowing concurrent bugreports" 2019-02-22 08:43:48 +00:00
Qasid Ahmad Sadiq
4d70022b88 Revert "Fix a11y cache correctness bug"
This fix introduced a painful crash that ends up disabling accessibility
services for certain users.
This happens when a client of AccessibilityCache tries to add a node, with the same id as a node previously in the cache, but fewer children, where the removed child is not in the cache.
This is because, when children are removed, and a the node is updated, the cache tries to clear the child trees. But if the child is not in the cache, the cache clears the whole tree. Every node is recycled.
Then the original node being replaced is attempted to be recycled again, and voila crash.

The fix also didn't fix the original issue based on the discussion in
b/114133438.

The risk for this is pretty low, since nothing was built on top of this.

This reverts commit 2f69c16c3d.
Bug: 124676705
Test: Tested to see if above usecase still happens.

Change-Id: I8a39698c4532a1613ba47e1c6ca70201cd496212
2019-02-21 21:07:12 -08:00
Sooraj Sasindran
9f0115bb6e Merge "Allow UiAutomation to adopt the shell permission indentity" 2019-02-22 00:41:29 +00:00
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Svet Ganov
c2841ec7fe Allow UiAutomation to adopt the shell permission indentity
For testing we often need to run shell commands. This can be done
today via running a shell command from an instrumentation test
started from the shell. However, this requires adding shell commands
which are not in the API contract, involve boilerplate code, require
string parsing, etc.

This change allows an instrumentation started from the shell to
adopt the shell UID permission state. As a result one can call APIs
protected by permissions normal apps cannot get by are granted to
the shell. This enables adding dedicated test APIs protected by
signatures permissions  granted to the shell.

Test: cts-tradefed run cts-dev -m CtsUiAutomationTestCases
          -t android.app.uiautomation.cts.UiAutomationTest#testAdoptShellPermissions

bug:80415658

Merged-In: I4bfd4b475225125512abf80ea98cd8fcacb6a1be
Change-Id: I4bfd4b475225125512abf80ea98cd8fcacb6a1be
2019-02-21 19:59:14 +00:00
Treehugger Robot
c1e55147c9 Merge "Add feature flag for Dynamic Android" 2019-02-21 17:32:25 +00:00
Nandana Dutt
cfb3d4856e Add a new error code for disallowing concurrent bugreports
BUG:123571915
Test: manual
Change-Id: I8787137c3cfeb33aacfa439f6eab1a668977e572
2019-02-21 16:17:54 +00:00
Paul Duffin
5d70cdf262 Update backwards compatibility support for android.test.base
Previously, the plan was for android.test.base to be removed from the
bootclasspath in P, i.e. in the same release as org.apache.http.legacy.
Any apps that targeted < P were to have the android.test.base library
added to their app classpath in order to maintain backwards
compatibility.

Unfortunately, it was not possible to remove android.test.base from P
and instead it is being removed from Q. This update prepares for that
by updating the backwards compatibility support and its tests to add
the android.test.base library to apps that target < Q.

The affected code is only used at runtime when
REMOVE_ATB_FROM_BCP=true.

Bug: 73711752
Test: atest FrameworksCoreTests with and without REMOVE_ATB_FROM_BCP=true
Change-Id: I76b40dad14193cd174114a351b1350c18d647bed
2019-02-21 10:42:12 +00:00
Howard Chen
0d958bbf1d Add feature flag for Dynamic Android
Bug: 119647479
Test: flashall and check the option exists.

Merged-In: I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd
Change-Id: I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd
2019-02-21 15:05:20 +08:00
Torne (Richard Coles)
5ed24cb220 Merge "Clarify WebResourceResponse's stream handling." into pi-dev
am: bec9d394d3

Change-Id: Ic15302edd0598107cf8fb7a91924ec544592b435
2019-02-20 20:50:22 -08:00
TreeHugger Robot
bec9d394d3 Merge "Clarify WebResourceResponse's stream handling." into pi-dev 2019-02-21 04:32:58 +00:00
Christian Wailes
49574608ae Merge "Updated Zygote IPC related comments." am: f8881b6821
am: c850654edc

Change-Id: I15a33cdf792727f58b3d89d86ccf454536737868
2019-02-20 16:12:40 -08:00
Beverly
0a9b851293 Merge "Override old alarms in zen schedule" into pi-dev
am: 2ab75b2b2e

Change-Id: I8db691e85b738d2d7821de715e124c1e3ce3b913
2019-02-20 12:29:58 -08:00
Chris Wailes
b13bfc5682 Updated Zygote IPC related comments.
Bug: 124637285
Test: None; comment only changes
Change-Id: Ie567715a1ee08cdf65e3135aa75e3bd95ef5ab0d
2019-02-20 11:19:54 -08:00
Raman Tenneti
31a61f6348 Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).

  https://b.corp.google.com/issues/35655737#comment34

Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.

Bug: 35655737
Bug: 118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit 33a11bd0e3)
2019-02-19 22:17:12 +00:00
Nathaniel R. Lewis
e1a3606ee6 Fixes for touchpad capture
When touchpad capture is enabled, events still are received via
onGenericMotionEvent. As pointer capture sends events via
onCapturedPointerEvent, this patch changes the callback used by
captured touchpads to also be onCapturedPointerEvent.

Make events from a captured touchpad cause the device to leave touch
mode. Captured mice cause the device to exit touch mode through
the virtual dpad which is mapped to it due to being
derived from SOURCE_CLASS_TRACKBALL.

Test: Write an app that starts pointer capture on a device with a
      touchpad. Events from touchpad should be received via
      onCapturedPointerEvent.

Test: Using the captured touchpad in the first test should cause the
      view to be focusable even when not in touch mode.

Change-Id: If6fa94c66f1d9395a13fd5f31f642567256dd818
2019-02-19 13:44:44 -08:00
Beverly
7ee646771b Override old alarms in zen schedule
Change-Id: I371a586d470e3e341a42fb5ae3b8f32929214c18
Merged-in: I371a586d470e3e341a42fb5ae3b8f32929214c18
Fixes: 112493468
Test: ScheduleCalendarTest
(cherry picked from commit 4e76191a9f)
2019-02-19 20:18:01 +00:00
Treehugger Robot
c0c27fbf49 Merge "Fix the bad link due to typo" 2019-02-16 01:56:30 +00:00
Remi NGUYEN VAN
6ce7de5e64 Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13
am: 2d7e53ca90

Change-Id: I709cb6796ed21522d264ea836daad58e987e7839
2019-02-15 16:56:43 -08:00
TreeHugger Robot
727bc71336 Merge "Fix the incorrect javadoc links" into stage-aosp-master 2019-02-16 00:53:47 +00:00
Remi NGUYEN VAN
2d7e53ca90 Merge "Fix framework and NetworkStack classes conflicts"
am: 3f23efdd13

Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
2019-02-15 16:38:52 -08:00
Remi NGUYEN VAN
3f23efdd13 Merge "Fix framework and NetworkStack classes conflicts" 2019-02-16 00:22:29 +00:00
Stanley Tng
dcdfaf3d6b Fix the bad link due to typo
Replaces the link with the new API name, createInsecureL2capChannel.

Bug: 70683224
Test: Compile
Change-Id: I9580d90722f8b0c0146a902bb5fcace4ef58d421
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2019-02-16 00:12:18 +00:00
Nan Zhang
944f18371b Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/5172152.

Test: m -j docs with -lerror enabled
Bug: b/116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
2019-02-15 14:39:24 -08:00
Remi NGUYEN VAN
0d49d3863b Merge "Move NetworkStack to services.net" am: 762f9f0c24
am: 51490ad0fa

Change-Id: I6a0ddc23bf95039d9d51a4fde9dd87d2f5bf71ee
2019-02-15 03:10:18 -08:00
Remi NGUYEN VAN
51490ad0fa Merge "Move NetworkStack to services.net"
am: 762f9f0c24

Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
2019-02-15 03:01:11 -08:00
Remi NGUYEN VAN
762f9f0c24 Merge "Move NetworkStack to services.net" 2019-02-15 10:52:03 +00:00
Remi NGUYEN VAN
84d7c7e1ef Merge "Remove NetworkMonitor dependency on ICaptivePortal" am: bfe928d593
am: 8a4908c1ab

Change-Id: I60c67a42bce60615f7e0ce86aaafac4fbff19795
2019-02-15 00:34:13 -08:00
Remi NGUYEN VAN
1b57e8e9db Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.

Do the following:
 - jarjar any shared source file between framework and NetworkStack, so
   the version in the NetworkStack uses a different package.
 - Move any shared class not used in the NetworkStack to services.net

The CL  uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.

Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug: 124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
2019-02-15 17:30:07 +09:00
Remi NGUYEN VAN
8a4908c1ab Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am: bfe928d593

Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
2019-02-15 00:26:34 -08:00
Remi NGUYEN VAN
bfe928d593 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00