Commit Graph

10974 Commits

Author SHA1 Message Date
George Mount
c4066d29b0 Merge "Address API council feedback." into oc-dev am: 4a71842dbd
am: b19b342466

Change-Id: I0e2fc8e10ba039872c78baef6000d630ef10a5e0
2017-04-27 14:24:55 +00:00
George Mount
4a71842dbd Merge "Address API council feedback." into oc-dev 2017-04-27 14:06:16 +00:00
Victor Chang
e04abdcd1a Merge "Add STATE_USER_SETUP_COMPLETE" 2017-04-27 10:57:32 +00:00
Tony Mak
217f6066e8 Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev am: 424dd39e25
am: d272847267

Change-Id: I255abd2bc0996a1d4daf9486da5ee11b5ea079c0
2017-04-27 10:38:59 +00:00
Tony Mak
60b2d05160 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev am: f4362fda59
am: 6fbfc05965

Change-Id: I0f286d3247bf3d4f6cd30e51f363a20d4b950c46
2017-04-27 10:37:39 +00:00
TreeHugger Robot
424dd39e25 Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev 2017-04-27 09:41:18 +00:00
TreeHugger Robot
f4362fda59 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev 2017-04-27 09:41:18 +00:00
Julia Reynolds
d6247427ac Merge "Api updates" into oc-dev am: f84467e19f
am: 7ee513c27b

Change-Id: Iafbf2f2ca92b288de7bded40772cd15eca2012ee
2017-04-27 05:15:11 +00:00
TreeHugger Robot
f84467e19f Merge "Api updates" into oc-dev 2017-04-27 04:51:46 +00:00
Winson Chung
b6efdda9a0 Updating PiP API and documentation. am: 709904f800
am: 1aef4da275

Change-Id: Id65ec5a93ef0eccbf4c06a7e3886e08f4d2ca913
2017-04-27 01:01:18 +00:00
Winson Chung
709904f800 Updating PiP API and documentation.
- Renaming PictureInPictureArgs to PictureInPictureParams, making it
  immutable and built with a builder class.  In addition, making the
  aspect ratio rational.
- Moving the check to get max number of actions to the activity to have
  more flexibility going forward
- Also ensures that enterPictureInPictureMode() returns true if the
  activity is already in PiP mode.
- Will follow up with CL to remove PictureInPictureArgs and related methods
  once this CL drops

Bug: 35765211
Bug: 37638323
Bug: 37637423
Bug: 37636674
Bug: 36342780
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: android.app.cts.PictureInPictureParamsBuilderTest

Change-Id: I54a487d55a59c9ce8ac7bd6c80c61209c8b26224
Signed-off-by: Winson Chung <winsonc@google.com>
2017-04-26 17:14:19 -07:00
Makoto Onuki
69d7bfe373 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev am: 397335d926
am: 9e3f4ac593

Change-Id: Ia95a458719f12454347adada6ca5a4f18c63e48b
2017-04-27 00:11:47 +00:00
Makoto Onuki
397335d926 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev 2017-04-26 23:34:00 +00:00
Tony Mak
3165743c50 setAffiliationIds and getAffiliationIds uses set instead of list
Didn't use @remove because java doesn't support two methods differs from
the return type only.

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_unaffiliatedUser
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Change-Id: Ic7c7221ef5e680a6765f028c2ab73d4c2f908c58
Fix: 37622682
2017-04-26 22:42:19 +00:00
George Mount
a0ffafffdd Address API council feedback.
Bug 37636027

Change FragmentTransaction#setAllowOptimization() to
FragmentTransaction#setReorderingAllowed().

Test: I729dc05bde1f6eba6ff8d38eb15f65de777c14bb
Change-Id: I24c35aad95ffa14d2e2fa092ae71d3d459e6d648
2017-04-26 14:37:57 -07:00
TreeHugger Robot
b1fb0ecbd3 Merge "Update comment to getDataOnlyRemoteInputs per API review." 2017-04-26 19:34:59 +00:00
Felipe Leme
6551a50c3d Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev am: 5f7979222d
am: 58510a2d6b

Change-Id: I2850e33f2be4970aeac8ca1bd0f61703a73b18db
2017-04-26 19:05:13 +00:00
Makoto Onuki
cbc0d11d21 Enhance DeviceAdminService javadoc and remove TODO.
Test: Javadoc only
Bug: 37706621
Change-Id: Iac09675ca923adf40aef8f1871ddd0de797d4a08
2017-04-26 12:03:59 -07:00
Felipe Leme
5f7979222d Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev 2017-04-26 18:38:21 +00:00
Tony Mak
eda0a9ae33 bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN
Test: cts-tradefed cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Fix: 37624960

Change-Id: I0df88d2a019a0c5f8f997db1efede35a20441fa8
2017-04-26 14:00:33 +00:00
Makoto Onuki
13f215c04d Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am: 781c8cb65e
am: 1ddaa67a59

Change-Id: Ice1a513a00e4b8962b11db6091f0bfe9e0f279f1
2017-04-26 00:54:07 +00:00
Jeff Sharkey
e00742f4c5 Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
am: db73950734

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
2017-04-26 00:41:04 +00:00
Seigo Nonaka
802c41bd11 Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a
am: a3d5786a3d

Change-Id: Ic9a30e9bf8404c3a469bb0c998fd876ee94a3488
2017-04-26 00:39:15 +00:00
TreeHugger Robot
781c8cb65e Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev 2017-04-25 22:42:10 +00:00
Jeff Sharkey
a00c7c0a99 Merge "Fix some issues found by new doclava linter." into oc-dev 2017-04-25 22:11:01 +00:00
Felipe Leme
e4f30650ac Provide a way to set AutofillId on ViewStructure.
So far that was done indirectly by public methods that could
be overridden in away that does not set the proper id in the structure,
which would crash apps.

Bug: 36171235
Test: modified VirtualContainerActivityTest#testAutofillOverrideDispatchprovideAutofillStructure

Change-Id: I3f1c64020125cbb8349971a0bc52ccd1e0c81e62
2017-04-25 14:12:03 -07:00
Julia Reynolds
bad4297600 Api updates
- Better documentation on DEFAULT_CHANNEL_ID
- Renaming getChannel/setChannel/getTimeout/setTimeout
- Add documentation to getShortcutId
- @hide parcel constructors

Test: make, make cts
Bug: 37672218

Change-Id: I695b2620c51638a84930e9d1c5fbfd6d85699b55
2017-04-25 17:00:05 -04:00
Julia Reynolds
a047d8944b Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf
am: 5bc54aad76

Change-Id: If2ba099e67ccdabf756a62858a5244679f9c1547
2017-04-25 20:47:12 +00:00
Pavel Grafov
b8349c7f11 Merge "Fix javadoc to clearly express units and base for time value." into oc-dev am: 0a001ed37f
am: 31f94f28d2

Change-Id: I0943630bf90e473814f14d44701ecb109f514726
2017-04-25 20:42:42 +00:00
Makoto Onuki
fe73970116 DeviceAdminService must be protected with BIND_DEVICE_ADMIN.
Bug: 37625902
Bug: 36226832

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Change-Id: I0bee75d758b565c6587d0e9cabf63bec351a0669
2017-04-25 13:31:37 -07:00
Shane Brennan
434815c5b5 Update comment to getDataOnlyRemoteInputs per API review.
Test: Comments-only change
Change-Id: I4ceaecea39ab9d34ae8f03ec1bc9eddb2e1588ab
2017-04-25 13:06:23 -07:00
Seigo Nonaka
54084b64b1 Font provider cleaning ups.
- Remove Columns.STYLE
- Decouple Context from Typeface.
- Make FontsContract constructor private since it is essentially static.
- Removed unused constants.

Bug: 37281200
Bug: 37268410
Test: am instrument -w -e class android.provider.FontsContractE2ETest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.FontsContractTest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.TypefaceTest
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic46c256141d27ca28f30023bcc40f4e1161d5338
2017-04-25 19:40:58 +00:00
Julia Reynolds
9685128edf Merge "Allow some notifications in a group to be muted" into oc-dev 2017-04-25 19:25:05 +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
Julia Reynolds
a79c37170e Allow some notifications in a group to be muted
Test: cts, runtest systemui-notification
Change-Id: I98b971c496c52f69e039a3a3101f71ac567b538a
2017-04-25 13:41:37 -04:00
Pavel Grafov
937bb7ff57 Fix javadoc to clearly express units and base for time value.
Bug: 37622877
Test: it's just javadoc.
Change-Id: I285b20f9ff6b82279f215879797fa263b318269a
2017-04-25 17:24:27 +01:00
Rubin Xu
add429d164 Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev am: a31f49a0df
am: e45651ba8f

Change-Id: I2c4e924c5e6a3317aca31ca56676e73e641e261e
2017-04-25 12:23:17 +00:00
Rubin Xu
dd0064d5b6 Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev am: 2c20a6db28
am: 0a555a6595

Change-Id: I6e22acaa9a183f97874f75ba71dc9ca1434ff60e
2017-04-25 12:13:16 +00:00
TreeHugger Robot
a31f49a0df Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev 2017-04-25 12:11:13 +00:00
TreeHugger Robot
2c20a6db28 Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev 2017-04-25 12:02:07 +00:00
Wale Ogunwale
8d7b1c9c11 Merge "Continue to @hide freeform decor caption APIs" into oc-dev am: 302ba2d3ab
am: 8f8c43bde8

Change-Id: Ied400c025038549532913a5f9d4ccd8573da5a4f
2017-04-25 06:15:30 +00:00
Wale Ogunwale
724ca14b20 Continue to @hide freeform decor caption APIs
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

May you make the P release!

Test: manual
Bug: 28774476
Change-Id: Ie4b4d1bdabef9b27d2eb1442ffc9f6c46ce7dfcb
2017-04-25 04:02:59 +00:00
Felipe Leme
85d1c2d290 Minor fixes on Autofill Framework:
- Removed default implementation of onProvideAutofillVirtualStructure() that
  was using accessibility API (it's useless because without the View calling
  AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.

Fixes: 37078783
Fixes: 33197203
Bug: 33802548
Bug: 35956626

Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
2017-04-24 16:01:12 -07:00
Karthik Ravi Shankar
5fd001ac82 Merge changes from topic 'virtual-display-api' into oc-dev am: 13ba34bf37
am: 875c8445a8

Change-Id: I12f88b60d82fba4227c9f565009e6c3e42f6798c
2017-04-24 22:45:33 +00:00
Jeff Sharkey
1f14b1509c Merge "Even more auto-doc work." into oc-dev am: 880f4f4cc2
am: 9652eef0b2

Change-Id: I96c77c62b6ee3b5acaa45e116d35c7114797a0b8
2017-04-24 22:43:34 +00:00
Felipe Leme
a61d217028 Merge "Replaced getUrl() by getWebDomain()." into oc-dev am: ffef2ad2b0
am: bf4451aa0e

Change-Id: I96fae5dae4a5b5a03d39170ad04b1d812f991668
2017-04-24 22:17:35 +00:00
TreeHugger Robot
7d56384a28 Merge "Minor fixes on Autofill Framework:" 2017-04-24 21:34:27 +00:00
TreeHugger Robot
13ba34bf37 Merge changes from topic 'virtual-display-api' into oc-dev
* changes:
  Add command line option to set compatibility display properties
  Make VR mode virtual display properties customizable
2017-04-24 21:33:59 +00:00
TreeHugger Robot
880f4f4cc2 Merge "Even more auto-doc work." into oc-dev 2017-04-24 21:33:18 +00:00
Todd Kennedy
d27b6e3204 Merge "Merge "fix service binding" into oc-dev am: 4eaeb91e42" into oc-dev-plus-aosp
am: af6b454b14

Change-Id: I55e0a3543202407577b6ebd433fdb8b406125137
2017-04-24 21:23:01 +00:00