Commit Graph

77002 Commits

Author SHA1 Message Date
Stefan Ramsauer
d043979327 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
am: ba9ab17434

Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af
2017-04-27 15:17:16 +00:00
Stefan Ramsauer
ba9ab17434 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev 2017-04-27 15:09:26 +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
Abodunrinwa Toki
3b75e31ca6 Merge "SmartSelection: Use downloaded model file." into oc-dev
am: a97608caa8

Change-Id: If5dbd82ad5150a1d4f3cfe35dd7325468f36a94c
2017-04-27 13:58:36 +00:00
TreeHugger Robot
a97608caa8 Merge "SmartSelection: Use downloaded model file." into oc-dev 2017-04-27 13:50:58 +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
Tony Mak
6fbfc05965 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev
am: f4362fda59

Change-Id: I130dc84ecfb47263679f6645a0b243f047c04e33
2017-04-27 09:48:13 +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
Kang Li
f595898fca Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
am: 6b36aeb491

Change-Id: Id08aa99bc81d260731fae25457b30e648171b291
2017-04-27 07:33:39 +00:00
TreeHugger Robot
6b36aeb491 Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev 2017-04-27 07:26:14 +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
Joe Fernandez
81a1217b71 Merge "docs: Update EditText JavaDoc comments" into oc-dev
am: cc7f08e997

Change-Id: I756fae9374b0bd2f30c7c1a856acdc09fe249adb
2017-04-27 05:33:23 +00:00
Joe Fernandez
bb2eecd532 Merge "docs: Update Button JavaDoc comments" into oc-dev
am: 1e5d0768cd

Change-Id: Ice1626bc12b0b605a97c8d921c352c5e600bc43a
2017-04-27 05:31:24 +00:00
TreeHugger Robot
cc7f08e997 Merge "docs: Update EditText JavaDoc comments" into oc-dev 2017-04-27 05:24:51 +00:00
TreeHugger Robot
1e5d0768cd Merge "docs: Update Button JavaDoc comments" into oc-dev 2017-04-27 05:21:23 +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
Peng Xu
5d34ce7f65 Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
am: 3ab258c98d

Change-Id: I2c36bf36a085f9c4535d74dc3245abfe56a2b322
2017-04-27 05:00:12 +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
Peng Xu
3ab258c98d Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev 2017-04-27 04:49:16 +00:00
Joe Fernandez
41043c27a7 Merge "docs: Update ScrollView JavaDoc comments" into oc-dev
am: 47ca22e361

Change-Id: I420d715eb686c1a27f888a394d764358cb227df6
2017-04-27 04:42:27 +00:00
Joe Fernandez
6e76d0dd0a Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
am: b312d38868

Change-Id: I1452e7e30f5eea7da222b093b0e8d6d1fb400c10
2017-04-27 04:40:19 +00:00
Svet Ganov
9bf772566b Merge "Handle package changes in autofill manager service" into oc-dev
am: 01d51288df

Change-Id: Idcc327443e903d7b5b09526babf62426e3b83291
2017-04-27 04:36:08 +00:00
Joe Fernandez
6fcab388e1 Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
am: ca105f6c29

Change-Id: I474bae032506243df9035056155fc0738f49e445
2017-04-27 04:33:16 +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
TreeHugger Robot
47ca22e361 Merge "docs: Update ScrollView JavaDoc comments" into oc-dev 2017-04-27 04:29:14 +00:00
TreeHugger Robot
b312d38868 Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev 2017-04-27 04:28:36 +00:00
TreeHugger Robot
01d51288df Merge "Handle package changes in autofill manager service" into oc-dev 2017-04-27 04:22:24 +00:00
TreeHugger Robot
ca105f6c29 Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev 2017-04-27 04:21:15 +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
songjinshi
b5322b2be5 [Stability]: fix system_server crash issue caused by fd leak.
If an app incorrect use of registerListener, it will cause
system_server socket fd leak, for example:
    protected void onResume() {
        super.onResume();
        mSensorManager.registerListener(new MySensorEventListener(),
                mSensor, SensorManager.SENSOR_DELAY_UI);
Each time a new SensorEventQueue, then in the system_server
will open a new socket fd, as time increases system_server's
fd will be more than 1024 and crash, so we needed add count limit
for sensor listener to improve the system stability.

Test: use the apk attached in the issue
      https://code.google.com/p/android/issues/detail?id=258634
Bug: 37543280

Change-Id: I35006966a1638c25bb0f54611e117e16a764e12b
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
2017-04-27 02:40:45 +00:00
Svet Ganov
48f10a2ab5 Handle package changes in autofill manager service
Autofill manager service was not observing package changes thus
we did not properly handle the cases of the service being updated,
added, and removed. Handling, additions is needed to properly
support restore from a backup. Fixed a few missing locks.

Test: all autofill CTS tests pass and manually tested update, add,
      and remove of autofill services.

bug:36638606
bug:36978445

Change-Id: Idd47891774ba2a4e562a1952cbb5a048211fd4e3
2017-04-26 19:22:05 -07: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
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
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
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
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