Commit Graph

4171 Commits

Author SHA1 Message Date
Ian Pedowitz
c96a358318 Merge "Revert "O is API 26"" into oc-dev
am: b42b9a22df

Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
2017-05-04 00:18:19 +00:00
Ian Pedowitz
b42b9a22df Merge "Revert "O is API 26"" into oc-dev 2017-05-04 00:07:10 +00:00
Yifan Hong
2e5ed49e86 Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
am: 0e0a37635e

Change-Id: I6e2c660971c296f363b66baa43231e18464ffc34
2017-05-03 22:48:32 +00:00
Ian Pedowitz
12025857cd Revert "O is API 26"
This reverts commit 9bcef8e2da.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
2017-05-03 22:00:56 +00:00
Tianjie Xu
f2e1a43ac5 Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265 am: c2a0d6776c
am: 1b0da0cdfd

Change-Id: I967edc50dff44d830e475b94678c0194a379dba1
2017-05-03 17:56:39 +00:00
Yifan Hong
75ffd667a9 Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug: 36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
2017-05-03 10:53:53 -07:00
Tianjie Xu
2db2f6d265 Merge "Add error/cause code reporting for Non A/B OTA failures" 2017-05-03 17:34:29 +00:00
Jorim Jaggi
53f6c02354 Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
am: 251894b134

Change-Id: I63323963266b4194f61c8e6d6cc30a63f9af78eb
2017-05-03 13:21:52 +00:00
TreeHugger Robot
251894b134 Merge "Fix lock contention: Call into power manager service from handler" into oc-dev 2017-05-03 13:16:32 +00:00
Jorim Jaggi
86c39f9ede Fix lock contention: Call into power manager service from handler
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.

Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened

Bug: 37888898
Bug: 36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
2017-05-03 13:22:47 +02:00
Tianjie Xu
223edeb272 Add error/cause code reporting for Non A/B OTA failures
Read and report the error_code & cause_code from last_install.

Bug: 36866437
Test: mma & observe the sysui event in logcat -b events
Change-Id: I5357861fc758e14ed3235bfc8cc76d7561ccea58
2017-05-02 23:02:11 -07:00
Michael Wright
8433705f77 Merge "O is API 26" into oc-dev
am: 074a67c116

Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
2017-05-02 22:17:25 +00:00
Michael Wright
9bcef8e2da O is API 26
Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
2017-05-02 19:23:12 +01:00
Yifan Hong
9f95b592f8 Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.

Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
2017-05-01 13:00:04 -07:00
Jeff Sharkey
e13d60764c Merge "Updates based on API council guidance." into oc-dev
am: 3ba7117164

Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442
2017-05-01 18:43:12 +00:00
Jeff Sharkey
3ba7117164 Merge "Updates based on API council guidance." into oc-dev 2017-05-01 18:36:25 +00:00
Salvador Martinez
ba1cc4bb42 Merge "Added dialog to notify user of thermal shutdown" into oc-dev
am: 4d09adcef1

Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851
2017-05-01 16:55:44 +00:00
Salvador Martinez
4d09adcef1 Merge "Added dialog to notify user of thermal shutdown" into oc-dev 2017-05-01 16:45:30 +00:00
Jeff Sharkey
000ce80505 Updates based on API council guidance.
Test: builds, boots
Change-Id: I223faf55c1e1b4d81d11b4c8b2d93ccd131c969b
Fixes: 37775662
Fixes: 37748635
Fixes: 37673408
Fixes: 37672564
Fixes: 37672218
Fixes: 37638323
Fixes: 37637423
2017-04-29 13:14:17 -06:00
Yifan Hong
6196ab62fb Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e
am: 5fe979b404

Change-Id: Iae202b22ecc136343d82711435d49ce3597fa74f
2017-04-29 03:19:09 +00:00
Treehugger Robot
4f8a375958 Merge "Add android.os.VintfRuntimeInfo" 2017-04-29 03:00:08 +00:00
Yifan Hong
1bda67369c Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.

Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
2017-04-28 17:10:28 -07:00
Jeff Sharkey
1737e50fa1 Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am: 4315c1e3d5

Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f
2017-04-28 17:38:33 +00:00
Jeff Sharkey
86e27f65f8 Merge "Respond to API council feedback." into oc-dev
am: 77cc43e0d2

Change-Id: I0c2b86d34cfd2b2f5b94bc693657b40ecbd764fe
2017-04-28 17:27:53 +00:00
Jeff Sharkey
4315c1e3d5 Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev 2017-04-28 17:10:26 +00:00
TreeHugger Robot
77cc43e0d2 Merge "Respond to API council feedback." into oc-dev 2017-04-28 17:10:16 +00:00
Pavel Grafov
776158ba4f Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
am: 90357d62e9

Change-Id: I925165817781c3b0f4e37afe8ebcce1ac264d775
2017-04-28 14:23:42 +00:00
Daichi Hirono
2443a091b1 @hide non-Handler variant of SM.openProxyFileDescriptor
Bug: 37749462
Test: Build succeeded
Change-Id: I2e3d0cf9e219353eae4dae384c93d99b9ef60ea9
2017-04-28 14:58:27 +09:00
Martijn Coenen
7c00639a68 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
Merged-In: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
2017-04-27 16:24:26 -07:00
Jeff Sharkey
a4d34d971c Respond to API council feedback.
Move aggressive allocation to @SystemApi, which means we can hide
the "flags" API variants.

Remove UUID APIs, since we should use existing Serializable APIs.

Relax permission checks to allow apps to ask for their own stats.

Improve docs.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37534687, 37534941, 37718184, 37738770
Change-Id: I6a763fb3ab3169c8d3329765bb31e1ee08d9ced7
2017-04-27 11:33:39 -06:00
Pavel Grafov
4f4f6f83c2 Introduce DISALLOW_BLUETOOTH_SHARING.
When this restriction is enforced Bluetooth sharing option should not be
present when the user tries to share something. Previously this was handled
by explicitly disabling bluetooth sharing activity during managed
provisioning, now this code is to be removed (see topic CLs) and the same
behavior should be achieved by setting this restriction for profile owners
by default.

In Bluetooth:
1) Don't check restrictions on boot, it is invoked anyway through the
  listener during boot.
2) Ignore when the restriction is "changed" from true to true - i think
  it was the initial intent in that condition.
3) Disable the component for a particular user and not always the
  system user. This is something that has to be fixed in O I think since
  currently in secondary user the bluetooth itself gets disabled but the
  sharing thing still shows up.

In DPMS:
1) Now ActiveAdmin for PO also contains a set of restrictions applied by
  default.
2) Now all ActiveAdmins for POs are loaded quite early. That shouldn't
  have huge impact though.

Bug: 36249732
Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testBluetoothSharingRestriction
Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java
Change-Id: I78c4ffbd503c4a10138e8c0862a9f206f24c5631
Merged-in: I78c4ffbd503c4a10138e8c0862a9f206f24c5631
(cherry picked from commit 7f4ad75218)
2017-04-27 18:06:07 +01:00
Salvador Martinez
a6f7b25c3d Added dialog to notify user of thermal shutdown
tldr; Have the phone check when it reboots if it last shut
down due to heat. If so, we should show the user an
notification and dialog giving them more details.

- Added hidden api to allow apps to query system_server
for the reason the phone last rebooted
- Added notification that is shown when the phone is
booted if the last shutdown was due to excessive
heat.
- Added dialog to provide more details about the
shutdown if the notification is tapped.
- Added tests to verify that file is read and
as expected.
- Updated code for high temperature warning that
is shown while the phone is running to avoid
mixups in the future.

Test: FrameworksServiceTests
Bug: 30994946
Change-Id: Ic25f42539911c89ba7f1834e206f7931d65c2865
2017-04-27 09:52:45 -07:00
Jeff Sharkey
db73950734 Merge "Fix some issues found by new doclava linter." into oc-dev
am: a00c7c0a99

Change-Id: I940b5ab896e4638e8178868acb65d79c078adbbe
2017-04-25 22:25:09 +00:00
Jeff Sharkey
0f3f60b576 Fix some issues found by new doclava linter.
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Jeff Sharkey
9652eef0b2 Merge "Even more auto-doc work." into oc-dev
am: 880f4f4cc2

Change-Id: I78199f8366fbda65a4b4917675291d946e29285c
2017-04-24 21:38:03 +00:00
Jeff Sharkey
30e06bb668 Even more auto-doc work.
Update docs based on what new lint detector found.  Add new @IntDef
to parameters or methods returning constants or flags, and add
@RequiresPermission to methods mentioning permissions.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I7f640f7883fcb66b911a52ae93b83f77306571ec
2017-04-24 13:20:46 -06:00
Robin Lee
40681387a9 Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b
am: 8b90758b25

Change-Id: I3314d547d402af1cef4f1e4f399fc5f200425bc1
2017-04-24 18:46:18 +00:00
Jeff Sharkey
f25b285706 Merge "More auto-doc work." into oc-dev
am: 6bc03748a7

Change-Id: I71f5f408abfa0d7cdf71711bb1bbab63341989c3
2017-04-24 18:23:35 +00:00
Robin Lee
53a122986d Merge "Remove unused network management RPCs" 2017-04-22 21:59:57 +00:00
Jeff Sharkey
910e081216 More auto-doc work.
Add support for AnyThread, CallSuper, and UiThread.

Another related CL started documenting @RequiresPermission, so remove
duplicated information in existing APIs.

Suppress auto-doc on a handful of classes that are already
well-documented.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I791437dccec0f11d5349a23b982ba098cb551af8
2017-04-21 16:35:08 -06:00
Jeff Sharkey
90d020d979 Merge "Fix code accounting bugs, track external app data." into oc-dev
am: 4b32f7c676

Change-Id: Ie14bf66fd93d6c461983a5232d4164c815cb56b7
2017-04-21 20:10:50 +00:00
Jeff Sharkey
4b32f7c676 Merge "Fix code accounting bugs, track external app data." into oc-dev 2017-04-21 20:01:43 +00:00
Pavel Grafov
9488302c42 Merge "Fix javadoc for some user restrictions." into oc-dev
am: 9c8bb68071

Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
2017-04-21 16:35:09 +00:00
Pavel Grafov
ce3e1a3c5f Fix javadoc for some user restrictions.
DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.

(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).

Bug: 36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f
2017-04-21 14:48:21 +01: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
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
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