Commit Graph

4144 Commits

Author SHA1 Message Date
Abodunrinwa Toki
e0a8e5bcef Merge "Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev am: 06a53d4729" into oc-dev-plus-aosp
am: 528adaed4f

Change-Id: If30d4f866655de89618d1afcb5560f9827691e11
2017-04-20 16:44:24 +00:00
Jocelyn Dang
cc63daaf55 Merge "Add min and max learned battery capacity to batterystats." into oc-dev am: b2aa0ceb0d
am: f29eb24c4e

Change-Id: I8f86cadf46b4cb9dc3dc87c1137f3b876108fca3
2017-04-20 16:08:48 +00:00
Abodunrinwa Toki
d5857c4e9f Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
am: 06a53d4729

Change-Id: Ia739bdad9c5877f9e02efba709521fb9c9dc8795
2017-04-20 16:08:24 +00:00
Martijn Coenen
1ca9b4e332 Merge "Validate incoming data properly." into oc-dev am: a0aa7c3093
am: 621c6019e7

Change-Id: I85b3b6a099cf1a7a7f1134f23601b8d2a774f6a3
2017-04-20 15:03:20 +00:00
Abodunrinwa Toki
06a53d4729 Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
* changes:
  SmartSelection Config installer.
  LangId Config installer.
2017-04-20 13:30:35 +00:00
Jeff Sharkey
3ea7c8b6d5 Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
am: 750d6d12f6

Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
2017-04-20 13:15:28 +00:00
Jocelyn Dang
f29eb24c4e Merge "Add min and max learned battery capacity to batterystats." into oc-dev
am: b2aa0ceb0d

Change-Id: I9822b8540decfef15473f05ef08563699aa0d20e
2017-04-20 04:40:10 +00:00
Jocelyn Dang
b2aa0ceb0d Merge "Add min and max learned battery capacity to batterystats." into oc-dev 2017-04-20 04:34:14 +00:00
Martijn Coenen
621c6019e7 Merge "Validate incoming data properly." into oc-dev
am: a0aa7c3093

Change-Id: Id0d0bf11bdacf091b4eb91bbe935131485d2c7f2
2017-04-20 01:17:12 +00:00
Jocelyn Dang
c627d10650 Add min and max learned battery capacity to batterystats.
BUG: 32645990
Test: manual

Change-Id: I3da569e48571cb86c640aed732abdf6c46a2bc73
2017-04-19 16:19:32 -07:00
Martijn Coenen
932b504865 Validate incoming data properly.
Make sure calls to readBuffer() and readEmbeddedBuffer()
get the correct size, parent and offset passed in, so
these can be validated by libhwbinder.

Modified HwBlob to take a length argument as well,
so it can be validated.

Bug: 30498700
Test: hidl_test, hidl_test_java, Youtube, Maps, Netflix, Camera
Change-Id: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
2017-04-19 15:14:20 -07:00
Jeff Sharkey
750d6d12f6 Merge "Flesh out more API docs." into oc-dev
am: 3a427c3bd9

Change-Id: I2031389cf3de22134af6ca48c0537e7ec3d150bc
2017-04-19 21:22:10 +00:00
Abodunrinwa Toki
bb957d12ba SmartSelection Config installer.
Test: none
Bug: 34780396
Change-Id: I9cb04e7b20b565ac5d128475a90bd065c805e95e
2017-04-19 21:39:41 +01:00
Abodunrinwa Toki
51c4203ab4 LangId Config installer.
Test: none
Bug: 34780396
Change-Id: I6cdd608ea9a41041d03640997c076c6e6fea0129
2017-04-19 21:35:07 +01:00
TreeHugger Robot
3a427c3bd9 Merge "Flesh out more API docs." into oc-dev 2017-04-19 20:31:05 +00:00
Jeff Sharkey
60a82cd4c2 Flesh out more API docs.
Flesh out docs for Context.getCacheDir(), Intent.addFlags(),
Intent.removeFlags(), and PackageManager.setApplicationCategoryHint().

Test: builds, boots
Bug: 37470473, 37327774, 35812899
Change-Id: Ided031185258a89c3e275d65c162d537065ad49e
2017-04-19 11:51:21 -06:00
Tao Bao
a37881db3d Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev am: a532f4d7f8
am: 9da2190238

Change-Id: Ic99e657d13ee7a6390aa1af57ce3b85925e953be
2017-04-19 16:44:24 +00:00
Tao Bao
9da2190238 Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
am: a532f4d7f8

Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32
2017-04-19 16:38:58 +00:00
Tao Bao
a532f4d7f8 Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev 2017-04-19 16:30:28 +00:00
Tao Bao
5b7925d78d Merge "RecoverySystem: Verify the package compatibility." into oc-dev am: e3872a4fc9
am: a9fd199fdd

Change-Id: I65c9418a651dd66f274ab6e331185731be10e8ea
2017-04-19 16:10:20 +00:00
Tao Bao
a9fd199fdd Merge "RecoverySystem: Verify the package compatibility." into oc-dev
am: e3872a4fc9

Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f
2017-04-19 16:05:25 +00:00
Tao Bao
e3872a4fc9 Merge "RecoverySystem: Verify the package compatibility." into oc-dev 2017-04-19 15:54:24 +00:00
Tao Bao
87daeb15fd RecoverySystem: Enable the package compatibility verification.
Hook up to android.os.VintfObject.verify().

Bug: 36592877
Test: Flash on marlin; verify with package that has and doesn't have
      compatibility.zip entry.
Change-Id: I4e73fa42f4e3fd2e1c5ffec2ffa6152538d62eee
2017-04-18 15:54:28 -07:00
Jeff Sharkey
498e095b6e Merge "Storage API polishing." into oc-dev am: 200d72d933
am: aead06b971

Change-Id: I13baad3e589cfe6b1ee257fa13742394cdee3c51
2017-04-17 23:57:40 +00:00
Jeff Sharkey
aead06b971 Merge "Storage API polishing." into oc-dev
am: 200d72d933

Change-Id: I1ad134599ee095628dcc7fe1da28bda40a1863f4
2017-04-17 22:39:20 +00:00
Tao Bao
e01b520dd4 RecoverySystem: Verify the package compatibility.
This CL extends the existing API RecoverySystem.verifyPackage() to
verify the compatibility entry in an OTA package. It returns true
directly if such an entry doesn't exist. Otherwise it reads and passes
the contents to VintfObject to perform the verification.

This CL also adds a new system API
RecoverySystem.verifyPackageCompatibility() to verify a given
compatibility zip file. It extracts all the entries and passes them to
VintfObject.verify() to verify the package compatibility. This API is
for streaming A/B OTAs only, where we don't download the full package
but only needed entries.

Bug: 36592877
Bug: 36596980
Test: RecoverySystem.verifyPackage() returns the same result for
      packages w/o a compatibility entry.
Change-Id: I038be672868a91820c045d1da100e8e33b23d442
2017-04-17 13:51:02 -07:00
Jeff Sharkey
789a8fc792 Storage API polishing.
Based on API council feedback, switch to using real UUID objects
instead of Strings.  Since UUID is a general-purpose utility class
that will be passed around quite a bit, add it to Parcel and Bundle.

Define well-known namespaced UUID values for "default" and "primary
physical" storage devices, which will let us annotate a bunch of
things with @NonNull.

Define new extras for MANAGE_STORAGE intent that apps can use to
signal where and how much space they'd like the user to free up.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I8421b126d680f69141a361c1e77223fe2bf4a325
2017-04-17 12:19:50 -06:00
Eugene Susla
1c6b5765bb Merge "API for notification listener for Companioon apps" into oc-dev am: 0d88904744
am: 0fb1104b25

Change-Id: I33326544bd1eef9abc900ea13cb2fdf32ad06cbe
2017-04-15 04:28:02 +00:00
Eugene Susla
0fb1104b25 Merge "API for notification listener for Companioon apps" into oc-dev
am: 0d88904744

Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
2017-04-15 04:22:48 +00:00
Eugene Susla
cf00adebec API for notification listener for Companioon apps
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I94d4116e1988db869ed445ae3fd018c50590e3f4
2017-04-14 19:01:53 -07:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
2017-04-14 18:01:24 +00:00
Yifan Hong
1ac3406335 Merge "Add Java API for libvintf." into oc-dev am: c223d70e64
am: 38bf613c0f

Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
2017-04-14 17:05:01 +00:00
Bookatz
c2c9363c7a Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a
am: 53b7ff2014

Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
2017-04-14 16:11:50 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
2017-04-14 16:04:32 +00:00
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Yifan Hong
38bf613c0f Merge "Add Java API for libvintf." into oc-dev
am: c223d70e64

Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
2017-04-14 04:13:04 +00:00
TreeHugger Robot
c223d70e64 Merge "Add Java API for libvintf." into oc-dev 2017-04-14 02:02:08 +00:00
Yifan Hong
becc56d7ea Add Java API for libvintf.
android.os.VintfObject has two methods:

- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
          compatible.

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

Bug: 36814503

Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
2017-04-13 18:04:05 -07:00
Bookatz
53b7ff2014 Merge "Collect background stats: syncs" into oc-dev
am: a8fc7bff5a

Change-Id: Id3f2d7b2a77c74657416e492519f2205bc46218a
2017-04-13 21:31:05 +00:00
TreeHugger Robot
a8fc7bff5a Merge "Collect background stats: syncs" into oc-dev 2017-04-13 21:20:14 +00:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
Bookatz
2bffb5bb3a Collect background stats: syncs
Added background times and counts for an app's sync usage.

Bug: 35669746
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java

Change-Id: I1c01c5044064277b97e8d330386454da3e8204da
2017-04-13 11:59:33 -07:00
Daichi Hirono
8bf30a7826 Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
am: 73b54bfd6d

Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469
2017-04-13 18:21:18 +00:00
TreeHugger Robot
73b54bfd6d Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev 2017-04-13 18:11:48 +00:00
Michael Wright
8f072af76d Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02
am: 49f1db32ef

Change-Id: If9510872fe549d06a4f2cdef6c96862f5dfd4127
2017-04-13 07:06:11 +00:00
Michael Wright
49f1db32ef Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
am: 07d60cce02

Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
2017-04-13 06:55:21 +00:00
TreeHugger Robot
07d60cce02 Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev 2017-04-13 06:48:29 +00:00
Daichi Hirono
e200ae8157 Address API review for ProxyFileDescriptorCallback
The CL revise the documentation for ProxyFileDescriptorCallback.

 * Added explanation to onFsync.
 * Added explanation about offset.
 * Mentioned ErrnoException should contain E constants in OsConstants.

Bug: 35813046
Test: Build succeed
Change-Id: Ied2490b1913445ea8240eb3aaf7c12170ae4e42d
(cherry picked from commit 9555e30288)
2017-04-13 03:40:08 +00:00