Commit Graph

69494 Commits

Author SHA1 Message Date
TreeHugger Robot
e7172ff9fb Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev 2017-04-27 23:45:44 +00:00
TreeHugger Robot
afd8d9e2b2 Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev 2017-04-27 23:38:28 +00:00
TreeHugger Robot
2b6bf2f221 Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev 2017-04-27 23:17:11 +00:00
Jakub Pawlowski
9a4b756c9b Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
* changes:
  Fix NPE when accessing mCallback in BluetoothGatt
  Expose LE advertiser address for easier PTS tests (1/6)
  Read by UUID for PTS tests (1/5)
2017-04-27 22:20:43 +00:00
TreeHugger Robot
13d03e504d Merge "Address API feedback for new fragment APIs" into oc-dev 2017-04-27 22:18:11 +00:00
Sujith Ramakrishnan
b4f21f0482 Merge "Updated intent action name to comply with CTS." into oc-dev 2017-04-27 22:10:09 +00:00
TreeHugger Robot
a851b5ae76 Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev 2017-04-27 21:44:56 +00:00
Evan Rosky
d0c6cf9bc0 Merge "Only restrict arrows out of text fields from keyboard" into oc-dev 2017-04-27 21:28:13 +00:00
TreeHugger Robot
e669ae438f Merge "Use invalid package names for special keys in AccountManager." into oc-dev 2017-04-27 21:23:40 +00:00
Seigo Nonaka
9610c69531 Remove FontsContract.buildTypeface with weight/italic argument.
Passing weight/italic to the family does not make sense.

Bug: 37750436
Test: N/A
Change-Id: I43a624179338c1f98aad36cfd08daa152e83944c
2017-04-27 14:15:52 -07:00
Jorim Jaggi
560324cfa0 Merge "Implement API council feedback for dismissKeyguard" into oc-dev 2017-04-27 20:57:11 +00:00
Sudheer Shanka
7e7f7d526d Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev 2017-04-27 20:47:09 +00:00
Sujith Ramakrishnan
48e19c8cc9 Updated intent action name to comply with CTS.
- Updated "android.intent.action.GLOBAL_BUTTON" to
	  @SystemApi

Test: manual - Bottom button on Fugu brings up pairing screen
Test: manual - GUIDE button on Fugu brings up TV channels app

Bug: 37499047
Change-Id: I3b92ed99aeb53674fbaac91126e8c5e7fcffa715
2017-04-27 13:26:43 -07:00
Tima Vaisburd
9c14b91aa9 Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev 2017-04-27 20:22:15 +00:00
TreeHugger Robot
3a4987bbe7 Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev 2017-04-27 20:21:49 +00:00
Jakub Pawlowski
0e0e75793d Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e.

Bug: 37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
(cherry picked from commit 0e4ac75f2e)
2017-04-27 13:16:32 -07:00
Jakub Pawlowski
348ba3da78 Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.

Bug: 35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
(cherry picked from commit 4bc4a44100)
2017-04-27 13:15:58 -07:00
Jakub Pawlowski
ce21cb903c Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.

Bug: 35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
(cherry picked from commit de74891d1c)
2017-04-27 13:15:43 -07:00
Makoto Onuki
301663a61b Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev 2017-04-27 20:03:22 +00:00
TreeHugger Robot
54e534d6e7 Merge "Use InetAddress instead of String in network events." into oc-dev 2017-04-27 19:53:58 +00:00
Adam Powell
10d69ac250 Address API feedback for new fragment APIs
Framework edition

Bug: 37637473
Bug: 37636731
Bug: 37638276

Test: run fragment tests
Change-Id: I3e77ab51d60f5a550d60701fc81a84e143a53244
2017-04-27 12:35:15 -07:00
Chad Brubaker
a9d0e6b205 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev 2017-04-27 19:30:57 +00:00
Dmitry Dementyev
cbe1bd1d42 Use invalid package names for special keys in AccountManager.
Bug: 37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
2017-04-27 19:15:57 +00:00
Andrii Kulian
bfe5aa23e8 Merge "Hide onMovedToDisplay callback" into oc-dev 2017-04-27 18:09:17 +00:00
Pavel Grafov
a6ea92097c Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.

Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.

Bug: 37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
2017-04-27 18:53:11 +01:00
TreeHugger Robot
e6746726bc Merge "Revise method comment on setFontVariationSettings" into oc-dev 2017-04-27 17:34:48 +00:00
Doris Liu
f4063d4201 Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev 2017-04-27 17:20:23 +00:00
Jorim Jaggi
f41e7664a2 Implement API council feedback for dismissKeyguard
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes: 37673408
2017-04-27 17:58:59 +02:00
Stefan Ramsauer
ba9ab17434 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev 2017-04-27 15:09:26 +00:00
George Mount
4a71842dbd Merge "Address API council feedback." into oc-dev 2017-04-27 14:06:16 +00:00
TreeHugger Robot
a97608caa8 Merge "SmartSelection: Use downloaded model file." into oc-dev 2017-04-27 13:50:58 +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
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
TreeHugger Robot
f147688149 Merge "Address API Council feedback." into oc-dev 2017-04-27 06:26:04 +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
Tima Vaisburd
2240ea6448 Hide getTextClassifier and setTextClassifier for WebView
Bug: 37724053
Test: Not needed, these methods have not been implemented.
Change-Id: I43c97cb13e80eeb13d53123a22230d5934b8a60d
2017-04-26 21:59:12 -07:00
TreeHugger Robot
d915c42150 Merge "Autofill binding permission fixes." into oc-dev 2017-04-27 04:56:44 +00:00
Adam Lesinski
4ca56978a9 AAPT2: Add workaround for non-standard package IDs
The dynamic ref table used to map build-time IDs to runtime IDs
is mainly used for shared resource libraries and has a few built-in
mappings (app 0x7f and framework 0x01).

Using a non-standard package ID like 0x80 causes a failure in package ID
lookup. The solution is to ship the dynamic_ref_table with an identity mapping
with any resource table that uses a non-standard package ID.

Adds some tests to ensure this works correctly.

Bug: 37498913
Test: make libandroidfw_tests
Test: make aapt2_tests
Change-Id: Ic3f67942384d34e7fdcbc94ded360e940e3ebc8a
2017-04-26 21:55:31 -07: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
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
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