Commit Graph

1003 Commits

Author SHA1 Message Date
Lucas Dupin
3ef7b09cac Merge "Enable systemui_theme feature flag" into pi-dev am: 14e605d7e9
am: 9da10af64b

Change-Id: I3dfdfcc303ae69fcfa5fee8da592e941d0b66518
2018-05-29 12:21:15 -07:00
Lucas Dupin
94eca2cbd4 Enable systemui_theme feature flag
Turning flag on even though translations are not ready in order to
expose feature and make sure it was properly tested before release

Change-Id: I10f515b1bdcae45d1ed6d6d293afe1853f44dc02
Bug: 63903361
Fixes: 75498812
Test: manual
2018-05-24 20:07:44 -07:00
Lucas Dupin
34cbecb71f Merge "SystemUI theme feature flag" into pi-dev am: 3884e936c9
am: 2fd55ef0f3

Change-Id: I49482a8ca297b72110d8309051564bccd970b42f
2018-05-24 12:30:35 -07:00
Lucas Dupin
06daff0660 SystemUI theme feature flag
Hide SystemUI theme under feature flag, this way we can enable it when
we're sure that all new strings were localized and the feature is ready
for prime time.

Bug: 63903361
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Change-Id: I1093d414d951b71cab7cff10187c63bdd80eeee2
2018-05-23 12:52:37 -07:00
Suprabh Shukla
daa0cbc6f9 Merge "Mitigating cache corruption in ArrayMap" into pi-dev am: 841de8fb31
am: 7e69f41b55

Change-Id: I9e5e678e89961720b25488aa13e5d35ef17f1f2a
2018-05-14 16:39:21 -07:00
Suprabh Shukla
1938e34e42 Mitigating cache corruption in ArrayMap
Before calling freeArrays, storing the array reference into a temporary
pointer so that the main pointer doesn't end up corrupting the static
pool of arrays on concurrent access. An earlier change missed a rare
case when removeAt was called for the last element in the map.

Test: atest android.util.ArrayMapTest
atest android.util.cts.ArrayMapTest

Bug: 78898947
Change-Id: I454c5b1600eb0a6c690e746df10f6a0ebcd8aa1d
2018-05-14 14:51:01 -07:00
android-build-team Robot
291b944d89 Merge "Adding batterystats history to proto dump." into pi-dev 2018-05-08 14:58:09 +00:00
android-build-team Robot
596b65217e Merge "Adding batterystats history to proto dump." 2018-05-08 02:38:23 +00:00
Kweku Adams
3d16091dd2 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

This is the same change as the pi-dev one (http://ag/3909863), but due
to changes in master, that change has a merge conflict, so I have to
create a separate CL for master.

Bug: 77727638
Test: it builds
Change-Id: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
2018-05-07 17:57:42 -07:00
Kweku Adams
71a9531806 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

Bug: 77727638
Test: flash device and check output of incident proto and
'dumpsys batterystats -c --history'

Merged-In: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
Change-Id: Ia0c993d1281cc350d93f9c13f5540b349a4bfb84
2018-05-07 17:53:57 -07:00
Howard Ro
76e3dbf0bd Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev am: 7ca1b03ece
am: e68a729b08

Change-Id: Ie15622ace2952c7ab30047b7935a1d03bfa31a1c
2018-05-07 17:12:11 -07:00
yro
be6d7f90e8 Re-enable the logging of APP_BREADCRUMB_REPORTED atom
Bug: 78613419
Test: manual, cts, unit tests
Change-Id: I279158c8031eda3ee648053ae6a0d13fde7f1176
2018-05-06 22:25:05 -07:00
Victor Hsieh
86187caf1b Avoid using 0 for fs-verity extension ID am: 4cf738204f
am: fed62ac9a3

Change-Id: Ic5ac29de7bdd615f7d173a6ab2e72cf34a6bca32
2018-05-02 13:57:11 -07:00
Victor Hsieh
4cf738204f Avoid using 0 for fs-verity extension ID
Also:
 * Adjust size and order of some fields
 * Fix Merkle tree size calculation bug

Test: Verify fs-verity works with kernel patch
Bug: 67380979
Change-Id: I58f14cfe9630c1ff62ed64dbf333bb1c9bfe0fb1
2018-05-02 16:40:34 +00:00
Victor Hsieh
8d1553b9b1 Verify best signature algorithms of all signers
The previous implementation does not verify signature algorithms of all
signers.  It's possible that the attacker can take an old apk (with
digest and signature of old algorithm) and add their own signer block
with new/P digest and signature.  In this case, the old implementation
only verifies the attacker's signature, thus the attacker can change apk
content easily.

The solution here is to verify digests of all best signature algorithms
by all signers.

It is expected to increase verification time, if the apk does have
multiple signers with different type of digests.

Test: apks still install
Bug: 78359754
Change-Id: I607edf219c25a2a7adfa27a21a94e9bfefbb6cec
Merged-In: I607edf219c25a2a7adfa27a21a94e9bfefbb6cec
(cherry picked from commit 2f2ced93e3)
2018-04-23 19:22:28 +00:00
Victor Hsieh
2f2ced93e3 Verify best signature algorithms of all signers
The previous implementation does not verify signature algorithms of all
signers.  It's possible that the attacker can take an old apk (with
digest and signature of old algorithm) and add their own signer block
with new/P digest and signature.  In this case, the old implementation
only verifies the attacker's signature, thus the attacker can change apk
content easily.

The solution here is to verify digests of all best signature algorithms
by all signers.

It is expected to increase verification time, if the apk does have
multiple signers with different type of digests.

Test: apks still install
Bug: 78359754
Change-Id: I607edf219c25a2a7adfa27a21a94e9bfefbb6cec
2018-04-20 15:45:37 -07:00
Caxton Chan
6f9ffd3b74 Merge "Enable feature flag for audio output switcher." into pi-dev am: 116e05cbba
am: fc01e133b5

Change-Id: I512891cb258131cd1b6174e60936f707f6a875a6
2018-04-16 12:50:14 -07:00
Caxton Chan
116e05cbba Merge "Enable feature flag for audio output switcher." into pi-dev 2018-04-16 19:24:31 +00:00
Michael Wright
725df7a10c Merge "Convert the BrightnessController to a log scale control." into pi-dev am: 56a5620b41
am: b8a9a324f7

Change-Id: I7a6e558cb8ae9b8a065f1293380c6b899ec12c4c
2018-04-16 09:36:39 -07:00
Michael Wright
585ff988bb Convert the BrightnessController to a log scale control.
Currently, the BrightnessController's UI is a linear scale control on
top of a linear backlight control, but humans perceive brightness on a
roughly logarithmic scale. By moving to a non-linear control, we both
give users more fine-grained control over the brightness of the display
as well as a UI that works more intuitively.

Test: manual
Bug: 73810208
Change-Id: I67090ad7c4ced0420314458473c9124cb9c61906
2018-04-16 14:47:33 +01:00
ryanywlin
651d0335c1 Enable feature flag for audio output switcher.
Bug: 74130772
Test: Build
Change-Id: I04d0276681488c73c62b1f9ab6114c948bb50482
2018-04-12 02:13:51 +00:00
Jeff Sharkey
dcc615a028 Merge "APIs to disable data usage notifications." into pi-dev am: f0b9fbebc0
am: 568a972669

Change-Id: I8bfcf47c10e5f43f963fe012e98d0afd83630e64
2018-04-11 16:51:25 -07:00
Jeff Sharkey
0a5570d49d APIs to disable data usage notifications.
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis.  (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active.  Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
2018-04-11 22:07:40 +00:00
Jeff Sharkey
f35b79c609 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev am: 5e0d360411
am: 4cd485f8e5

Change-Id: I5f3f1b04573a8a2286cf4d6456d7196fc5ed417d
2018-04-09 18:09:12 -07:00
Victor Chang
56cb29c0c3 Remove the feature flag for time zone picker
Bug: 72376227
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Test: manual
Change-Id: I4880f8e37d53879b971890a5d83ebdf1a417a262
2018-04-06 14:57:30 +01:00
Jeff Sharkey
0fc6d03b62 API council requested tweaks to SubscriptionPlan.
Return new shiny Range<> object instead of Pair<>.  Tell developers
what permission to check on refresh broadcast.  Describe what
exceptions might be thrown, and that an empty list is okay.

Allow creation of plans with richer Period object, instead of forcing
them into rigid week or day options.

Protect SubscriptionPlan broadcast.

Test: atest android.util.RecurrenceRuleTest
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Bug: 74945820
Change-Id: I7e555798e0cfaa214ca93d9df627c6443fc5d986
2018-04-04 16:06:27 -06:00
Victor Hsieh
c2d78cbc78 Merge "Fix fs-verity per fs-verity spec change" into pi-dev am: 01a0288ca1
am: 943eb5a051

Change-Id: I0a4c8d6bfeedef853a864e755cb21b61b4ff80f8
2018-03-31 00:12:56 +00:00
TreeHugger Robot
d05c00fbb6 Merge "Require signing cert history certs to be unique." into pi-dev 2018-03-30 23:35:54 +00:00
TreeHugger Robot
01a0288ca1 Merge "Fix fs-verity per fs-verity spec change" into pi-dev 2018-03-30 18:43:24 +00:00
Daniel Cashman
10d19e9808 Require signing cert history certs to be unique.
Bug: 73943012
Test: android.appsecurity.cts.PkgInstallSignatureVerificationTest
Change-Id: Id7e91c60f1619ef793d73a9dd736debf7ad2ae0c
(cherry picked from commit ef05408bcd)
2018-03-30 15:13:42 +00:00
TreeHugger Robot
4f06ed479c Merge "Require signing cert history certs to be unique." 2018-03-30 00:35:13 +00:00
Daniel Cashman
ef05408bcd Require signing cert history certs to be unique.
Bug: 73943012
Test: android.appsecurity.cts.PkgInstallSignatureVerificationTest
Change-Id: Id7e91c60f1619ef793d73a9dd736debf7ad2ae0c
2018-03-29 10:00:08 -07:00
TreeHugger Robot
dea705ba59 Merge "Remove feature flag for battery settings" into pi-dev 2018-03-27 20:23:23 +00:00
Lei Yu
4c4efd09de Remove feature flag for battery settings
Bug: 76027338
Test: Build
Change-Id: Ie15e7b05d81e93a9db0569a3e7c00faf9c9a60e3
2018-03-26 14:50:42 -07:00
Jeff Sharkey
eb738c1c50 API council requested tweaks to DataUnit.
Test: none
Bug: 71584606
Change-Id: Ic516dd7645e150586d7dd2e389e7663a32924ecc
2018-03-26 13:37:20 -06:00
Victor Hsieh
cccad1971e Fix fs-verity per fs-verity spec change
- Reorder and adjust fields per fs-verity format change.
- Since header + tree is no longer full page size, pass the length with
  shared memory (which is full pages).
- Fix offset and padding of patch extension.
- It is now required to issue the measure ioctl (via
  assertFsverityRootHashMatches) right after fs-verity is enabled.

Test: adb install a new priv app, saw fs-verity log in dmesg. Read the
      whole file successfully.
Bug: 30972906
Change-Id: I480ae2b5debaf76ef24dadf2d79d1903c7967f03
2018-03-23 22:16:09 -07:00
Kurt Marcinkiewicz
991b971acb Merge "Allow specifying a network for SNTP time sync" into pi-dev 2018-03-23 18:02:19 +00:00
Kurt Marcinkiewicz
dfdd82e84f Allow specifying a network for SNTP time sync
Permits syncing over a specific network instead of the default for
the process. This was causing an issue with Android Wear devices
paired with iOS where the default network is bluetooth
(see b/32663274).

This CL is in support of ag/3776564

Bug: 32663274

Test: adb shell am instrument -e class android.net.SntpClientTest -w \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ic9fc169cf75457810d4992121d85d7642e350b90
2018-03-22 13:43:25 -07:00
Jan Nordqvist
5c4a42d532 Enable new data usage settings features.
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I0d2942bf8b8e13ebefd7df899a6ecfc6595d1780
2018-03-21 15:09:04 -07:00
Eugene Susla
18e7fc1114 [DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()
Fixes: 73904014
Test: using TestBack, ensure the attached bug is fixed
Change-Id: I097ca47563420d658cea083a3b6f8d5e7d02991c
(cherry picked from commit 8f0124190a)
2018-03-20 19:39:06 +00:00
David Chen
c1a3a0d780 Small fixes to StatsManager API.
Adds some annotations, deletes an unused API method, and adds some
comments.

Test: Flashed onto marlin-eng and verified there are no crashes.
Bug: 72562867
Change-Id: I6c93ee4aeeacf6842795256c76551cfb1c28888d
2018-03-19 10:26:51 -07:00
Chenjie Yu
33a6141cd2 Fix uid for AppBreadcrumbReported for 3p app
Bug: 74897773
Test: gts test
Change-Id: I79ef4efaf37ead570a2fe0d96e2c394a79a20a93
2018-03-15 18:06:06 +00:00
Annie Meng
7d3033b11f DO NOT MERGE Create a key value settings observer for backup parameters
Extracts an abstract class to observe changes in backup parameter settings that
are stored as a comma-separated key value list. This class is
responsible for registering and unregistering a content observer on the
setting and updating local references to the parameters.

Refactor BackupManagerConstants and LocalTransportParameters to use this
implementation. This will also be used for the new backup timeout
setting.

Bug: 74346317
Test: 1) m -j RunFrameworksServicesRoboTests ROBOTEST_FILTER=BackupManagerConstantsTest
2) gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases -t com.google.android.gts.backup.TransportFlagsHostSideTest

Change-Id: Id4c50fbcf7479c925515887e3fa70e166dd9955c
2018-03-13 18:47:46 +00:00
Victor Hsieh
4ba1eeaa0e Verify the content length in the verity digest
When generating digest for verity, for the last incomplete 4k chunk, the
data is padded with 0s.  This implies that we can not tell from the
digest whether the file contains 0 or not, or how many 0s.

Since the verity hash is used by the kernel, the definition cannot be
change.  Instead, the actual hashed content length is appended to the
original digest and is verified before used.

Also uprev algorithm IDs.

Test: use new apksigner to sign an apk, apk can be installed on device
Bug: 30972906
Change-Id: I382af6e4090c7dc3f92d5acb5ac5d02d1f496992
2018-03-07 13:28:32 -08:00
Annie Meng
292d895fb2 Merge "Validate restore of NetworkPolicy settings" into pi-dev 2018-03-07 17:07:51 +00:00
Doris Ling
1af6f81488 Add feature flag for audio output switcher.
Bug: 74130772
Test: rebuild
Change-Id: I06224975550ab4017d1546b182af083a36c0eacc
2018-03-06 15:17:10 -08:00
Annie Meng
47f5c9c55f Validate restore of NetworkPolicy settings
We want to catch potential exceptions that occur when restoring
NetworkPolicy settings. Here, a DateTimeException can be thrown when
we try to read the recurrence rule from the backup data and cannot
parse a timezone.

We also add GTS tests to validate that these catches persist and that
we don't crash when given unexpected backup data to restore.

Bug: 73942796
Test: gts-tradefed run gts -m GtsBackupHostTestCases -t com.google.android.gts.backup.NetworkPolicyRestoreHostSideTest
Change-Id: I6f6ea09d2fff60b8d704c6160234e6f032321103
(cherry picked from commit 853097ca2c)
2018-03-06 13:47:24 +00:00
Maurice Lam
805ea225b9 Merge "Revert "Small fixes to StatsManager API."" 2018-02-28 07:20:36 +00:00
Maurice Lam
c0df1f2354 Revert "Small fixes to StatsManager API."
This reverts commit 16dcd33abd.

Reason for revert: b/73975175

Bug: 73975175
Change-Id: I5bcccde100900b1370c2e43b8bcfc7d1697e5c72
2018-02-28 04:17:25 +00:00
TreeHugger Robot
e6370474a7 Merge "Remove connected devices feature flag" 2018-02-28 00:42:28 +00:00