Commit Graph

70683 Commits

Author SHA1 Message Date
Joe Fernandez
f29dab8317 Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev am: 80fe019f6b
am: 140a0c4569

Change-Id: I413a86d8371afff68fbfa1f868643b9c65ea5b98
2017-04-27 04:40:23 +00:00
Joe Fernandez
140a0c4569 Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
am: 80fe019f6b

Change-Id: Ia821d6edb1c0c1b44b7a1f33490c4046d81ff2cc
2017-04-27 04:31:10 +00:00
Bartosz Fabianowski
86a60af911 Merge "Add device ID attestation method to keymaster" into oc-dev am: 9138c5dfa7
am: 06269a51a3

Change-Id: I0a6189a43f3da80e3e6c70e419bd19e492a3431a
2017-04-27 04:21:21 +00:00
TreeHugger Robot
80fe019f6b Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev 2017-04-27 04:12:48 +00:00
Bartosz Fabianowski
06269a51a3 Merge "Add device ID attestation method to keymaster" into oc-dev
am: 9138c5dfa7

Change-Id: I27c7bd606df0c584d897523c787ae684e9c0c30c
2017-04-27 04:04:45 +00:00
TreeHugger Robot
9138c5dfa7 Merge "Add device ID attestation method to keymaster" into oc-dev 2017-04-27 03:51:35 +00:00
Thierry Strudel
ece721f8cd Merge "Update UsbService to V1_1 usb hal" 2017-04-27 03:28:12 +00:00
Kevin Chyn
fc92b9ff8e Add setting to enable ES while sleeping
Also changed code so that our contentObserver updates relevant ES
variables when settings are changed

Fixes: 37719853

Test: manual
Change-Id: I624fd5e6cec728ccb01d01b6a8779764aa418a6a
2017-04-26 18:52:39 -07:00
Daniel Sandler
84c00e396e Merge "Avoid ClassCastException in ArrayMap." into oc-dev am: f9e5395081
am: c467559093

Change-Id: I078ba5b3ce2acaab5151e37f0a0f718f15a230dd
2017-04-27 01:38:07 +00:00
Daniel Sandler
c467559093 Merge "Avoid ClassCastException in ArrayMap." into oc-dev
am: f9e5395081

Change-Id: I2b8b50865bd6db37092ac5752bf280a74e840074
2017-04-27 01:31:40 +00:00
Daniel Sandler
f9e5395081 Merge "Avoid ClassCastException in ArrayMap." into oc-dev 2017-04-27 01:23:57 +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
1aef4da275 Updating PiP API and documentation.
am: 709904f800

Change-Id: I28e4de6ab2072c53cc5d7da77b7d70acb63d8ef0
2017-04-27 00:46:25 +00:00
Felipe Leme
66dc79b16c Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev am: 62bb027d12
am: 889bdc8dc9

Change-Id: Icc27cc9f47339845ebeed647116c914db1cca162
2017-04-27 00:18:21 +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
Felipe Leme
889bdc8dc9 Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
am: 62bb027d12

Change-Id: If9e223a9cc7585568eb86995f0d0ef458d2c658c
2017-04-26 23:54:31 +00:00
Makoto Onuki
9e3f4ac593 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev
am: 397335d926

Change-Id: Ie69d82114c5df99261c3d9fcfe2dd47eb6d7ddf1
2017-04-26 23:49:58 +00: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
Felipe Leme
62bb027d12 Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev 2017-04-26 23:46:21 +00:00
Makoto Onuki
397335d926 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev 2017-04-26 23:34:00 +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
Ajay Panicker
048adae957 Merge "Limit btsnoop file size (3/8)" 2017-04-26 23:02:45 +00:00
Rob Carr
10382bf1ca Merge "Fix logspam NPE." into oc-dev am: bd1ef76684
am: 96a018166a

Change-Id: Iaae66abc2d4709d84498522483f5042e48d7f6b4
2017-04-26 22:05:04 +00:00
Rob Carr
96a018166a Merge "Fix logspam NPE." into oc-dev
am: bd1ef76684

Change-Id: I16bfcd16236ba42302208dce37e3eb08907f2c91
2017-04-26 21:54:48 +00:00
Rob Carr
bd1ef76684 Merge "Fix logspam NPE." into oc-dev 2017-04-26 21:43:30 +00:00
Badhri Jagan Sridharan
ef4b303fc2 Update UsbService to V1_1 usb hal
This CL adapts Usb service to V1_1 hal.
V1_1 hal supports reporting audio_adapter accessory
and debug accessory.

Bug: 36604276
Test: Manually test inserting an Audio accessory.
Also tested to made sure that change is compatible with V1_0
implementations
Change-Id: I8e44f5e9ae14b0e41965e8d355c99ac42af93f23
2017-04-26 21:43:07 +00:00
TreeHugger Robot
b1fb0ecbd3 Merge "Update comment to getDataOnlyRemoteInputs per API review." 2017-04-26 19:34:59 +00:00
Felipe Leme
bb81092a31 Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE.
Also removed obsolete 'cmd autofill save'

Bug: 2153814
Test: manual verification

Change-Id: I082e6bb098e9be5d9e26d0941efcf6f28ab01e1d
2017-04-26 12:07:17 -07: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
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
Dan Sandler
d0ecb1ed10 Avoid ClassCastException in ArrayMap.
Only happens if you're put()ing and clear()ing the map from
different threads, and Dianne told you not to do that.

In addition to avoiding the cache poisoning that results
from concurrent access, ArrayMap now attempts to throw
ConcurrentModificationException if clear() or
ensureCapacity() or put() notices you've modified the map
elsewhere.

Bug: 32994281
Test: runtest -x frameworks/base/core/tests/coretests/src/android/util/ArrayMapTest.java
      runtest -x cts/tests/tests/util/src/android/util/cts/ArrayMapTest.java
Change-Id: Ia75970aa9e2b2b65692179f51243584b9773797f
2017-04-26 14:18:15 -04:00
Seigo Nonaka
443afa50fc Merge "Load font file from remote provider synchronously." into oc-dev am: 1c661d1943
am: 6c0dd10a7c

Change-Id: Ifc66af9b116093e3d63bfedd1782f017a7126d3a
2017-04-26 18:13:40 +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
6c0dd10a7c Merge "Load font file from remote provider synchronously." into oc-dev
am: 1c661d1943

Change-Id: I29b540d331a40ad47ad0561ecefb1269cb76a188
2017-04-26 18:02:17 +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
1c661d1943 Merge "Load font file from remote provider synchronously." into oc-dev 2017-04-26 17:49:59 +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
nharold
52dab83f7a Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d
am: 939528045a

Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224
2017-04-26 17:31:23 +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
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