Commit Graph

1128 Commits

Author SHA1 Message Date
Johnson Lu
73eb2bf380 Add feature flags for WiFi connectivity feature
Bug: 120743100
Bug: 120744414
Test: Manual
Change-Id: Iaf26a947ac16b4a77d524492638dc489056d9e8b
2018-12-11 01:08:28 +00:00
Doris Ling
66cbe991ba Remove data usage v1 code.
Bug: 117420679
Test: make RunSettingsLibRoboTests
Change-Id: I3862b27c4e1df7d5bf560131bf29b89630603cc9
2018-11-30 16:34:45 -08:00
Neil Fuller
f148c8d7d4 Merge "Track move of timezone classes to libcore.timezone" am: d48dbc9a34 am: f79ecf7c82
am: 402dc485d0

Change-Id: If9c8cfdce9bd0b3bcd460216edca369fd75abdde
2018-11-28 08:24:57 -08:00
Neil Fuller
402dc485d0 Merge "Track move of timezone classes to libcore.timezone" am: d48dbc9a34
am: f79ecf7c82

Change-Id: I1551e5d4330ea290ba3e3054349f79ee28f919c6
2018-11-28 08:10:04 -08:00
Neil Fuller
b8383a10b9 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Change-Id: Ic807977a85276b888362295d1d305effe33076fc
2018-11-27 14:44:59 +00:00
Neil Fuller
894b41c3f8 Merge "Track move of timezone classes to libcore.timezone" am: bfd3237eac
am: 0f2e3d68be

Change-Id: Ia88ee2fae4d3c21f2b7b96513bc4e276df13bc28
2018-11-26 15:46:42 -08:00
Neil Fuller
69ffbd67c2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Merged-In: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
(cherry picked from commit 164394db8e)
2018-11-22 09:57:12 +00:00
Neil Fuller
f58e10d979 Merge "Track move of timezone classes to libcore.timezone" 2018-11-22 09:31:19 +00:00
Neil Fuller
164394db8e Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
2018-11-22 09:31:04 +00:00
Neil Fuller
f35dd4fa6c Merge "API for retrieving time zone IDs by country" am: 4492ec573a
am: b5ab9c2e1f

Change-Id: I69b477e36d760e5d06c232fc7fd0891d98dd52b6
2018-11-21 07:55:55 -08:00
Neil Fuller
4492ec573a Merge "API for retrieving time zone IDs by country" 2018-11-21 15:18:27 +00:00
TreeHugger Robot
d26b8bc796 Merge "resolve merge conflicts of 183271d1d2 to master" 2018-11-20 15:23:40 +00:00
yuanjiahsu
b39b469b12 resolve merge conflicts of 183271d1d2 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808
2018-11-20 20:55:49 +08:00
Neil Fuller
6caa954ead API for retrieving time zone IDs by country
New method has been requested by Setup Wizard.

Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest
Bug: 116544863
Merged-In: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
(cherry picked from commit f9bb2d8f02)
2018-11-20 10:59:18 +00:00
Neil Fuller
9347978d5f Merge "API for retrieving time zone IDs by country" 2018-11-20 09:33:24 +00:00
Yuanjia Hsu
183271d1d2 Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9

Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4
2018-11-19 23:12:33 -08:00
yuanjiahsu
2c69b0b487 Modify feature flag of Personal Safety
1.Remove feature flag and let Emergency Dialer Shortcut feature always
enabled.
2.Add feature flag for Safety Hub (the bug ID to clean up this feature flag is b/118848485).

Test: Manually
Bug: 117128459
Bug: 118809382
Change-Id: I0a3819629bc579d93c682451abdf271d0b36bf59
2018-11-19 13:12:28 +00:00
Doris Ling
da476111bb Turn on feature flag for data usage v2.
- and update failing test case.

Change-Id: I6c12ce1fbae4ffa0c183df8a2bbf6867886b4986
Fixes: 117433810
Test: make RunSettingsLibRoboTests
2018-11-16 12:37:10 -08:00
Neil Fuller
f9bb2d8f02 API for retrieving time zone IDs by country
New method has been requested by Setup Wizard.

Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest
Bug: 116544863
Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
2018-11-14 19:38:13 +00:00
Emily Chuang
7e15b7cc40 Turn on feature flag of settings contextual homepage.
Fixes: 118691898
Test: manual
Change-Id: I434d3c7827c03857974211a354264c542e1323f7
2018-11-12 18:16:35 +08:00
Lei Yu
cb9366507b Merge "Turn on feature flag for mobile network v2" 2018-11-09 20:41:06 +00:00
jackqdyulei
7c75c9088c Turn on feature flag for mobile network v2
Bug: 114749736
Test: Manual
Change-Id: I1066293b882b9f57b22a7be3ab37ba3b642df3c0
2018-11-08 14:25:14 -08:00
Fan Zhang
778e113378 Remove feature flag for bluetooth_while_driving
Test: rebuild
Change-Id: I28c83d13257538710a641330ed0107f64b991282
2018-11-07 15:10:41 -08:00
yuanjiahsu
4c7f6c2b38 Add feature flag for Safety Hub
Add feature flag to launch Safety Hub app instead of Emergency Info
app for teamfood in the future.

Test: Manually
Bug: 118809382
Change-Id: I2fb6ca18419a542159eb070876e01c6130038daa
2018-11-05 21:32:34 +08:00
Kweku Adams
53de12ef0d Merge "Slight improvements to ArraySet." 2018-11-02 22:28:48 +00:00
Stanley Tng
3cd1bff4c7 Merge "Change the feature flag for Hearing Aid behavior" am: 31d6ca5c3a
am: 91396395e1

Change-Id: I2f2411e9ca6564dce34123e282613c306c8734ea
2018-11-02 09:09:31 -07:00
Kweku Adams
65b5ee346d Slight improvements to ArraySet.
1. There are cases where valueAt could return null even though the given
index was out of bounds. I've added a check for that in the code.
2. The default implementation of Collection.removeIf() uses the
iterator(). This change avoids that since the iterator is an inefficient
way to access the array contents.

Benchmark tests. Note that these times are in nanoseconds:

Before:

INSTRUMENTATION_STATUS: removeIf_Small_Base_mean=163679
INSTRUMENTATION_STATUS: removeIf_Small_Base_median=158215
INSTRUMENTATION_STATUS: removeIf_Small_Base_min=129564
INSTRUMENTATION_STATUS: removeIf_Small_Base_standardDeviation=24779
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_mean=5645195
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_median=5584964
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_min=5448560
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_standardDeviation=206915
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_mean=1316514
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_median=1282442
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_min=1216533
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_standardDeviation=109087
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_Base_mean=571712
INSTRUMENTATION_STATUS: removeIf_Large_Base_median=566500
INSTRUMENTATION_STATUS: removeIf_Large_Base_min=535726
INSTRUMENTATION_STATUS: removeIf_Large_Base_standardDeviation=26374
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_mean=946
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_median=896
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_min=841
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_standardDeviation=106
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_mean=2196954
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_median=2163910
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_min=2136283
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_standardDeviation=91149
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_mean=356644
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_median=350376
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_min=337067
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_standardDeviation=17354
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_mean=1044645
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_median=1040981
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_min=1010144
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_standardDeviation=35016
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_mean=507561
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_median=503419
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_min=471564
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_standardDeviation=33141
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_mean=300889
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_median=295486
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_min=282948
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_standardDeviation=19869
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_InBounds_mean=644
INSTRUMENTATION_STATUS: valueAt_InBounds_median=584
INSTRUMENTATION_STATUS: valueAt_InBounds_min=528
INSTRUMENTATION_STATUS: valueAt_InBounds_standardDeviation=141
INSTRUMENTATION_STATUS_CODE: -1

After:

INSTRUMENTATION_STATUS: removeIf_Small_Base_mean=143926
INSTRUMENTATION_STATUS: removeIf_Small_Base_median=145985
INSTRUMENTATION_STATUS: removeIf_Small_Base_min=125700
INSTRUMENTATION_STATUS: removeIf_Small_Base_standardDeviation=11112
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_mean=5173581
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_median=5168995
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_min=5108405
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_Negative_standardDeviation=45739
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_mean=695812
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_median=690070
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_min=679793
INSTRUMENTATION_STATUS: removeIf_Large_RemoveHalf_standardDeviation=17959
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_Base_mean=591815
INSTRUMENTATION_STATUS: removeIf_Large_Base_median=588499
INSTRUMENTATION_STATUS: removeIf_Large_Base_min=573707
INSTRUMENTATION_STATUS: removeIf_Large_Base_standardDeviation=14348
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_mean=4010666
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_median=4017245
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_min=3970170
INSTRUMENTATION_STATUS: valueAt_OutOfBounds_EdgeCase_standardDeviation=28577
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_mean=734297
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_median=732576
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_min=720065
INSTRUMENTATION_STATUS: removeIf_Large_RemoveAll_standardDeviation=14906
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_mean=195026
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_median=194430
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_min=190400
INSTRUMENTATION_STATUS: removeIf_Small_RemoveHalf_standardDeviation=4012
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_mean=772914
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_median=785834
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_min=737947
INSTRUMENTATION_STATUS: removeIf_Large_RemoveNothing_standardDeviation=23808
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_mean=194325
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_median=196492
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_min=186998
INSTRUMENTATION_STATUS: removeIf_Small_RemoveAll_standardDeviation=5091
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_mean=187122
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_median=187292
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_min=182272
INSTRUMENTATION_STATUS: removeIf_Small_RemoveNothing_standardDeviation=4902
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: valueAt_InBounds_mean=918
INSTRUMENTATION_STATUS: valueAt_InBounds_median=919
INSTRUMENTATION_STATUS: valueAt_InBounds_min=801
INSTRUMENTATION_STATUS: valueAt_InBounds_standardDeviation=80
INSTRUMENTATION_STATUS_CODE: -1

Perf test command:
mmma -j ./frameworks/base/apct-tests/perftests/core/;
adb install -r $OUT/data/app/CorePerfTests/CorePerfTests.apk;
adb shell cmd package compile -m speed -f com.android.perftests.core;
adb shell am instrument -w -e class android.util.ArraySetPerfTest com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner

Bug: 118339123
Bug: 117846754
Test: atest android.util.cts.ArraySetTest
and benchmark tests (see above)
Change-Id: Ic4b10fd2bbc7a745ca4e4029ca4829847812fabe
2018-11-01 17:39:35 -07:00
Beth Thibodeau
5898ac47b2 Adding screen recording function.
Screen recording can be launched via long press on screenshot in
the global actions menu if the local feature flag is enabled.
Otherwise, long press on screenshot will also trigger a screenshot.

Demo videos: https://drive.google.com/open?id=1oJzfzJb8aGXSUqn4CZ_Yn7qWmJ2dvRd5

Test: manual
Change-Id: I373d38ad86291ff6f26f7dca3195001bd8f5ee16
Bug: 111395687
Bug: 118826991
2018-11-01 15:56:39 -04:00
Stanley Tng
799232a4a9 Change the feature flag for Hearing Aid behavior
Previously, this feature flag for Hearing Aid Profile is to disable the
profile on supported phone . This CL will reverse the logic and is
to enable the Hearing Aid profile on unsupported phone. This is to allow
testing of this profile on unsupported phone.

Test: Manual tests on different types of phones
Bug: 116861680
Change-Id: Ic8db4445a58942c5f75598dce0503f6670ff9c7b
Merged-In: Ic8db4445a58942c5f75598dce0503f6670ff9c7b
(cherry picked from commit afa1f9c5c5)
2018-11-01 09:17:01 -07:00
yuanjiahsu
8d09dd4285 Default enable EMERGENCY_DIAL_SHORTCUTS feature
Set feature flag default value to be true so that this feature will be
enabled by default.

Test: Manually
Bug: 113539598
Change-Id: I3caec4f437a5c574763215a31efd0df1be40ab6e
2018-10-30 11:31:04 +08:00
TreeHugger Robot
07e23a0e52 Merge "Remove obsolete lock screen UI" 2018-10-29 23:55:31 +00:00
Lucas Dupin
ed00262486 Remove obsolete lock screen UI
Removes obsolete KeyguardSliceView title area and adds doze callbacks
necessary to support new lock screen design.

Bug: 111405682
Test: manual
Test: atest KeyguardSliceViewTest
Change-Id: I07e96dbde68d4e5e38e1371526bedf59fc925b86
2018-10-29 11:07:00 -07:00
Antony Sargent
dbaeac07a2 Add a feature flag for new version of Network and internet settings page
Bug: 116349402
Test: Manual (settings_network_and_internet_v2 flag should should up in
Settings -> System -> Developer options -> Feature flags)

Change-Id: I9715b6b33478d992857538756d2515a560396e8b
2018-10-25 16:48:23 -07:00
TreeHugger Robot
c4b7e853c1 Merge "Change the feature flag for Hearing Aid behavior" 2018-10-17 04:57:55 +00:00
Neil Fuller
39568a2436 Remove usage of StringFactory
Code outside of the runtime should not use StringFactory.
The java.lang.String API works fine.

Bug: 113148576
Test: build only
Change-Id: I67ce6d7a13afd3ca7c0beffb33289d93e906e4be
2018-10-16 13:24:15 +01:00
Stanley Tng
cbfcbd168b Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116317072
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I58a9d339941e235242c443c85b6f4194b5a296c9
Merged-In: I58a9d339941e235242c443c85b6f4194b5a296c9
(cherry picked from commit fe8c8337ed)
2018-10-13 16:16:33 -07:00
kopriva
5569b5757c docs: bug 37077993, object instead of array am: 2cb96ab8a1
am: 434a0a5370

Change-Id: I42ce04dae49f3496c0993e60957137e58abb2d07
2018-10-03 17:09:53 -07:00
kopriva
434a0a5370 docs: bug 37077993, object instead of array
am: 2cb96ab8a1

Change-Id: I527d10e66525810bda0083bed92f4b31ae13bcb9
2018-10-03 16:52:26 -07:00
kopriva
2cb96ab8a1 docs: bug 37077993, object instead of array
also fixing import order to get past repo hooks

Test: make ds-docs

Bug: 37077993

Change-Id: I0a0d6338f714108eb632caacc6dda4b422dc697b
Exempt-From-Owner-Approval: Docs-only change
2018-10-03 14:14:13 -07:00
Michael Groover
a117b0d4bd Add PackageSignatures readXml tests
This fix also refactors PackageParser.SigningDetails to move the
pastSigningCertificatesFlags to be a data member of Signature; this
allows the capabilities of a previous signing certificate to be
accessed directly from the Signature object as opposed to relying
on the 1-1 mapping of the past certs and flags in the SigningDetails.

Fixes: 73927696
Fixes: 73925989
Test: adb shell am instrument -w -e class com.android.server.pm.PackageSignaturesTest \
      com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I635f2d2209350d066d1fa2ef07460071da0c023e
2018-10-03 09:47:14 -07:00
Stanley Tng
a5866c647e Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116317072
Bug: 116044083
Test: Manual testing using Settings App
Merged-In: I58a9d339941e235242c443c85b6f4194b5a296c9
(cherry picked from commit fe8c8337ed)

Change-Id: I7d0b6759e7acba3fb2a4d1afdba35d5a95387777
2018-10-01 21:49:13 -07:00
Jake Wharton
a8a0435d59 Expose a few APIs in util collections.
These are either already exposed on other specialized collection variants or are exposed as public API on the androidx versions, or both.

With these APIs exposed, all of the unsupported app usage can be done through public API. As a result, all unsupported app usage is now locked to apps targeting API 28 or earlier.

Bug: 116877302
Test: none, no implementation change
Change-Id: I548d71319bffb0a6b529e380ea936df674dbf515
2018-09-29 02:04:33 -04:00
Victor Hsieh
27300925e6 Disambiguate fs-verity and apk-verity
Standard fs-verity does not allow skipping part of the file.  Let's call
the original version for APK "apk-verity" for now.

Test: atest PtsApkVerityTestCases
Bug: 112037636
Change-Id: I11264d5959b034fe373802c53d08f329fa926e58
2018-09-28 13:03:27 -07:00
Stanley Tng
afa1f9c5c5 Change the feature flag for Hearing Aid behavior
Previously, this feature flag for Hearing Aid Profile is to disable the
profile on supported phone . This CL will reverse the logic and is
to enable the Hearing Aid profile on unsupported phone. This is to allow
testing of this profile on unsupported phone.

Test: Manual tests on different types of phones
Bug: 116861680
Change-Id: Ic8db4445a58942c5f75598dce0503f6670ff9c7b
2018-09-28 12:37:56 -07:00
Stanley Tng
172efa1ed8 Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116317072
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I58a9d339941e235242c443c85b6f4194b5a296c9
Merged-In: I58a9d339941e235242c443c85b6f4194b5a296c9
(cherry picked from commit fe8c8337ed)
2018-09-26 14:10:44 -07:00
Victor Hsieh
92513d9fea Support regular fs-verity Merkle tree
In addition to the legacy "apk-verity" Merkle tree that skips the
Signing Block, now the builder supports the regular Merkle tree.

The class and methods are made public because it will be used in
different package.

Test: atest PtsApkVerityTestCases
Test: With other changes, observe the hash matches what other tool
      generates.
Bug: 112037636
Change-Id: I3d96932cd16f4f330170547d6a7689d2997e4b85
2018-09-25 17:03:18 -07:00
TreeHugger Robot
7ba1d9bbd1 Merge "Refactor: break fs-verity data gen into 2 parts" 2018-09-20 18:29:44 +00:00
yuanjiahsu
8eb9d4711b resolve merge conflicts of 2cb9a70cac to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3
2018-09-17 23:46:14 +08:00
Yuanjia Hsu
2cb9a70cac Merge "Add feature flag in Settings." am: 55b91f6d93
am: b04fcd5842

Change-Id: I22e073bcbe7c2bacfdce44dd4c05b47fab3059f1
2018-09-17 07:25:33 -07:00
TreeHugger Robot
f147f12863 Merge "Add feature flag for seamless transfer" 2018-09-14 02:43:02 +00:00