Commit Graph

17285 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
b19b342466 Merge "Address API council feedback." into oc-dev
am: 4a71842dbd

Change-Id: Ia9511f1031463b6e65437e27e6012b8e83e8961d
2017-04-27 14:18:10 +00:00
George Mount
4a71842dbd Merge "Address API council feedback." into oc-dev 2017-04-27 14:06:16 +00:00
Narayan Kamath
47cfd4c0ea Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev am: 2e0e7f3c94
am: 32eb4022fd

Change-Id: I3f0b1527ab5125b375878ec71de5501e27f04010
2017-04-27 13:52:35 +00:00
Narayan Kamath
32eb4022fd Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
am: 2e0e7f3c94

Change-Id: I14acd4352f04f16294bfc1b97c2ad9a0b9a533d4
2017-04-27 13:43:50 +00:00
Narayan Kamath
2e0e7f3c94 Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev 2017-04-27 13:30:35 +00:00
Victor Chang
e04abdcd1a Merge "Add STATE_USER_SETUP_COMPLETE" 2017-04-27 10:57:32 +00:00
Joachim Sauer
ccac69e11a Merge "Deprecate internal Calendar methods." into oc-dev 2017-04-27 10:49:46 +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
d272847267 Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
am: 424dd39e25

Change-Id: I5e0f9a3f556ae0a078577e68694054ead19d268a
2017-04-27 09:49:14 +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
Steve McKay
eebe305a52 Merge "Address API Council feedback." into oc-dev
am: f147688149

Change-Id: I3f4e3f74058b1f1e0af4cf5a2c095fb0c265c003
2017-04-27 06:33:19 +00:00
TreeHugger Robot
f147688149 Merge "Address API Council feedback." into oc-dev 2017-04-27 06:26:04 +00:00
Felipe Leme
f5c6ce029c Merge "Autofill binding permission fixes." into oc-dev am: d915c42150
am: bd67d13bfc

Change-Id: I714263ccec13b4e96f30b180340b9087f900ae0b
2017-04-27 05:21:36 +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
Felipe Leme
bd67d13bfc Merge "Autofill binding permission fixes." into oc-dev
am: d915c42150

Change-Id: I355fe15bed198f2db1bd819bbeb138be9bea56d2
2017-04-27 05:11:38 +00:00
Julia Reynolds
7ee513c27b Merge "Api updates" into oc-dev
am: f84467e19f

Change-Id: I136a7713ee8f2b625b58aac29f5315c5b336256b
2017-04-27 05:04:18 +00:00
TreeHugger Robot
d915c42150 Merge "Autofill binding permission fixes." into oc-dev 2017-04-27 04:56:44 +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
Felipe Leme
decd887f01 Autofill binding permission fixes.
- Removed deprecated BIND_AUTO_FILL
- Renamed BIND_AUTOFILL to BIND_AUTOFILL_SERVICE
- Kept BIND_AUTOFILL as @hide
- Fixed the permission code

The permission check was actually ignored; it was probably broken when we
introduced support to settings.

Fixes: 37723410
Bug: 37563972
Test: manual verification with existing client
Test: CtsAutoFillServiceTestCases pass

Change-Id: If3abdcb0ae850f0a327bfdbb9ca6c44a24823047
2017-04-26 17:57:53 -07:00
Winson Chung
1aef4da275 Updating PiP API and documentation.
am: 709904f800

Change-Id: I28e4de6ab2072c53cc5d7da77b7d70acb63d8ef0
2017-04-27 00:46:25 +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
Seigo Nonaka
865ae63322 Merge "Font API clean up" into oc-dev am: 25c2cdc052
am: 7de96042ed

Change-Id: If2580c1ea3b58b377484a26fd7e9107e9958e3ed
2017-04-26 23:49:09 +00:00
Seigo Nonaka
7de96042ed Merge "Font API clean up" into oc-dev
am: 25c2cdc052

Change-Id: Ica94609836262103b721138eaac413c8192a7ca7
2017-04-26 23:32:57 +00:00
Seigo Nonaka
25c2cdc052 Merge "Font API clean up" into oc-dev 2017-04-26 23:20:01 +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
Hall Liu
f18e050007 Merge "Remove default public ctor from RttModifyStatus" into oc-dev 2017-04-26 20:04:32 +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
Felipe Leme
58510a2d6b Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev
am: 5f7979222d

Change-Id: I64c55257b3652f1435f7beba1640fc0081ce4229
2017-04-26 18:50:39 +00:00
Felipe Leme
5f7979222d Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev 2017-04-26 18:38:21 +00:00
Seigo Nonaka
d26950e0a8 Merge "Update FontsContract.requestFonts" into oc-dev am: 57dc8328f5
am: 927353aa3e

Change-Id: I81c18b59201641440da1d4678722c7c7e5a81771
2017-04-26 18:08:29 +00:00
Nathan Harold
35eb324bf1 Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev 2017-04-26 18:03:00 +00:00
Seigo Nonaka
080b054bdd Font API clean up
- Move FontRequest from android.graphics.fonts to android.provider since
  this is only used by android.provider.FontsContract and never draw
  anything.
- FontRequest is no longer being Parcelable.
- Remove FontSpec.aidl which is not necessary.

Bug: 37326126
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.provider.cts.FontProviderTest
      android.provider.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.cts.FontRequestTest
      android.provider.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I0eb501844247c2f07eaa1fc7a71f72e404888b5b
2017-04-26 18:00:17 +00:00
Seigo Nonaka
927353aa3e Merge "Update FontsContract.requestFonts" into oc-dev
am: 57dc8328f5

Change-Id: I0d12ebae014abf185d05bc6dc7a37bdf3c5e44b3
2017-04-26 17:59:59 +00:00
nharold
17472fa1c1 Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a am: 52dab83f7a
am: 9f218096de

Change-Id: Id67890a061c4e7aef91c7dea61e8706cfdd6bc6e
2017-04-26 17:52:39 +00:00
Svetoslav Ganov
4480564bed Merge "Get rid of custom negaitve save button label am: dc6cccb905" into oc-dev-plus-aosp
am: c8dda2ad63

Change-Id: Idb3668a644fa3a528811f59121fb0e5e252a82db
2017-04-26 17:50:10 +00:00
Seigo Nonaka
57dc8328f5 Merge "Update FontsContract.requestFonts" into oc-dev 2017-04-26 17:48:42 +00:00
nharold
9f218096de Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a
am: 52dab83f7a

Change-Id: I3bf240b35c3d509c4e016ffe20519c1bda5ab0b3
2017-04-26 17:38:58 +00:00
Philip P. Moltmann
ac2a91672c Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev am: dd91a5636b
am: 934238ff22

Change-Id: Ief2c8bcae4c39a7f51d368cb2b0426deea6bae99
2017-04-26 17:20:14 +00:00
nharold
01e368f26d Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" 2017-04-26 17:10:33 +00:00
Svetoslav Ganov
b26ff658a8 Get rid of custom negaitve save button label
am: dc6cccb905

Change-Id: Ib92a9487a18c821199cc8c13b7b4353cbe5c1f99
2017-04-26 17:04:59 +00:00
Svetoslav Ganov
dc6cccb905 Get rid of custom negaitve save button label
Removed the ability for an autofill provider to set
a custom string for the negative button. Also make
the old hidden APIs non-abstract to avoid runime
crashes for unimplemented methods.

Test: CtsAutoFillServiceTestCases pass

bug:37649790

Change-Id: If776d26de48382eeb064bdead5d4d5fdb0ff2e7e
2017-04-26 16:48:20 +00:00
Chen Xu
f4db619b0b Merge "Extend carrier configs for visual voicemail" 2017-04-26 16:42:09 +00:00
Philip P. Moltmann
934238ff22 Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
am: dd91a5636b

Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae
2017-04-26 14:22:48 +00:00
Philip P. Moltmann
dd91a5636b Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
* changes:
  Return all previous FillContexts onFill
  Report multiple FillContext-s onSave
2017-04-26 14:16:55 +00:00
Narayan Kamath
5b12ddcc00 Track libcore change 03e8c7dca78a95ccf719a7.
Deprecate dalvik.system.DexFile.

Bug: 37693775
Test: make checkapi;
Change-Id: I37c9068e3d4b2b2599eee96f75185c13b328bda6
2017-04-26 10:24:09 +01:00
Jakub Pawlowski
5df218c5c4 Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
  Bluetooth: expand comments on new PHY constants
  Bluetooth: document status value in PHY read/update
  Bluetooth: Add handler parameter to connectGatt
  Get rid of the IAdvertiserCallabck
2017-04-26 08:16:53 +00:00
Nathan Harold
ac11ccb1f6 Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.

Bug: 37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
2017-04-26 06:50:54 +00:00