OSDN Git Service

Merge changes from topic "work_mode_api1"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 21 Dec 2017 01:20:28 +0000 (01:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Dec 2017 01:20:28 +0000 (01:20 +0000)
commitda8d32efbbd582705b859eef0d935e5620099ee8
treed14cc2c5d17863e31764134e53ccecf9834163aa
parent247791f9ceaed13e639587aa4d046078252e2c7a
parente3d1f65ab684faf4a1194bde2618543d71697b46
Merge changes from topic "work_mode_api1"

* changes:
  Add access control to trySetWorkModeEnabled and make it public
  Merge setQuietModeEnabled and trySetQuietModeDisabled into one API
api/current.txt
api/system-current.txt
core/java/android/os/UserManager.java
core/res/AndroidManifest.xml