Commit Graph

301953 Commits

Author SHA1 Message Date
Treehugger Robot
f68cb55cc1 Merge "Fix coretests: Remove dependency on libnativehelper" 2016-11-17 18:37:42 +00:00
Wale Ogunwale
cdc0ddca91 Fixed NPE in ActivityStarter.updateTaskReturnToType()
Bug: 30834977
Test: Manual testing of condition in bug.
Change-Id: I4b46a380fa0b52d983965dfb056b461c53afcd05
2016-11-17 10:34:58 -08:00
Jerry Zhang
e05713d93b Merge "Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8" 2016-11-17 18:30:16 +00:00
Sean Stout
10c2bd47a9 Update ringtone picker strings.
Test: manual - verified new strings in en_US
Bug: 32645011
Change-Id: I8316bcb93e850f9e5d4331622f92dd11257a09dc
2016-11-17 10:20:05 -08:00
Jack Yu
80a0e6d56e Added configuration for VT downgrade/tear down when data disabled
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
2016-11-17 09:59:33 -08:00
Jeff Sharkey
923e0b8811 Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 10:45:55 -07:00
John Reck
24e98b7667 Add more complex View inflation bench
Test: ran ViewPerfTest#testTwelveKeyInflate

Change-Id: I644e1f77fa1108dcd2d54216d1e740b112a2e21b
2016-11-17 09:03:31 -08:00
TreeHugger Robot
6acb4efca3 Merge "Support Surface and Layer Readback in the SkiaPipelines." 2016-11-17 16:17:59 +00:00
Przemyslaw Szczepaniak
ab8c119689 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c am: d771b36951
am: 728ce76156

Change-Id: I8f340a9ff5f98ad028db8ebd7502f6b12d0c464c
2016-11-17 15:56:56 +00:00
Przemyslaw Szczepaniak
728ce76156 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c
am: d771b36951

Change-Id: Ia37618f5de09faa89f2ed421eae0760118c1483e
2016-11-17 15:49:22 +00:00
Przemyslaw Szczepaniak
d771b36951 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am: caa816451c

Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
2016-11-17 15:41:57 +00:00
Przemyslaw Szczepaniak
caa816451c Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" 2016-11-17 15:28:53 +00:00
Derek Sollenberger
189e87498f Update pinImages to report when GPU resource limits are exceeded.
Bug: 32691999
Test: proposed CTS test (ag/1500396) and existing UiRendering tests
Change-Id: I190f888ae5499ac048569af8256fdd31d19d1285
2016-11-17 09:56:53 -05:00
Abodunrinwa Toki
fb3d63ee69 Merge "TRON logging for TextView gesture - Long press." 2016-11-17 12:59:00 +00:00
Nicolas Prévot
554140fc89 Merge "Check user restriction DISALLOW_REMOVE_USER in isProvisioningAllowed." 2016-11-17 11:35:42 +00:00
Abodunrinwa Toki
1b304e4073 TRON logging for TextView gesture - Long press.
Bug: 32572232
Test: Manually confirmed that stats were sent for logging by checking
  adb logs according to go/tron-howto.
Change-Id: I1ea09174190247c219ce42f70c7db75148033685
2016-11-17 10:51:26 +00:00
Wan He
3ff4226363 Fix incorrect calculation of sizeof package structure
Argument "package" is a pointer, not the structure.

Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
2016-11-17 18:05:20 +08:00
Seigo Nonaka
b7e33a0984 Remove obsolete interface GetTable.
GetTable is only used in test.
To use production interface, need to pass the raw buffer and size to the
MinikinSkia.  This CL does not change any production behaviors.

Test: ran hwui microbench, macrobench, hwui_unit_tests
Change-Id: Ia657a0d061984d705f333ed3944effb1eba8ca4d
2016-11-17 18:26:41 +09:00
Seigo Nonaka
1a625911a2 Merge "Add wordSpacing parameter to Paint" 2016-11-17 08:00:01 +00:00
Pavlin Radoslavov
c51275a5e5 Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8
am: ffb6a4beab

Change-Id: I2924dfe291a6a29620d4e22c47c32716516911e3
2016-11-17 07:22:23 +00:00
Pavlin Radoslavov
ffb6a4beab Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b
am: c15cc348e8

Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c
2016-11-17 07:16:13 +00:00
Pavlin Radoslavov
c15cc348e8 Merge "Don't disconnect an A2DP device when connecting to same device"
am: 3ebcf1218b

Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
2016-11-17 07:07:20 +00:00
Treehugger Robot
3ebcf1218b Merge "Don't disconnect an A2DP device when connecting to same device" 2016-11-17 06:58:43 +00:00
Pavlin Radoslavov
eb067ba741 Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.

Test: Manual A2DP testing with a phone and wireless headsets
Bug: 32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
2016-11-17 05:29:08 +00:00
Hyundo Moon
af18c40b70 Merge "Fix wrong JavaDoc parameter names of ExifInterface.getJpegAttributes()" 2016-11-17 04:49:12 +00:00
Adrian Roos
ae0c5e8d2c Doze: Fix WakeLock bug
Change-Id: I3d687bbf82173723c420058867531a970d1f46cb
Fixes: 32857549
Test: runtest -x $(gettop)/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
2016-11-16 20:15:09 -08:00
Hyundo Moon
89779299f1 Fix wrong JavaDoc parameter names of ExifInterface.getJpegAttributes()
Test: By comparing the parameter names manually.
Change-Id: I3f67e43174754a73d498be6bf2882481cd80a648
2016-11-17 11:44:12 +09:00
Peter Qiu
9562122699 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc
am: 120cb677f0

Change-Id: I7a1321952bd8fa0bb6a032cc847fbc0eba6ac67c
2016-11-17 02:35:38 +00:00
Dimitry Ivanov
43b1b3ff0b Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.

This change fixes these problems by removing dependency and renaming
JNI method.

Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
2016-11-16 18:35:35 -08:00
TreeHugger Robot
2ba9de340b Merge "Add a category key for development options." 2016-11-17 02:34:35 +00:00
Peter Qiu
120cb677f0 Merge "wifi: add constant definition for EAP types" am: a908e65b66
am: 40dfd2d0bc

Change-Id: I155c39131c820cf7eb77ee8b9bb2b51b3eed3d08
2016-11-17 02:28:13 +00:00
Peter Qiu
40dfd2d0bc Merge "wifi: add constant definition for EAP types"
am: a908e65b66

Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
2016-11-17 02:21:41 +00:00
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
TreeHugger Robot
6bc6b6fe5a Merge "Report boot statistics" 2016-11-17 01:39:12 +00:00
Jerry Zhang
bb2965d239 Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8
Change-Id: I43ad588644c03a2174146525ad62b3d512d66074
2016-11-16 17:37:54 -08:00
TreeHugger Robot
0d11dc0cbb Merge "Switch back to NativeAllocationRegistry" 2016-11-17 01:20:33 +00:00
Jerry Zhang
5ca0000141 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422
am: 12488ed15f

Change-Id: I83b0e723f86791eaa5d5fbc7d21172a69bb8090b
2016-11-17 00:50:53 +00:00
dooyoung.hwang
e9556a89db Share one receiver for CurrentUserTracker
Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.

Test: Check if Quicksetting order is changed properly
after switching user.

Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab
2016-11-17 09:47:28 +09:00
Fan Zhang
1a28d6359d Merge "Remove tiles pointing to same intent within same category." 2016-11-17 00:43:07 +00:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
e35770642d Clean up persistent usb state on boot. am: dfacad026d am: b15490ac4d
am: 5d77efb3d9

Change-Id: I7e941f2d1491d4b0fa9b97577ac0e9cca3569673
2016-11-17 00:38:06 +00:00
Jerry Zhang
6bb98d85a0 Fixed handling of usb state during adb changes. am: 0269ebe0fe am: 4389cb6c9a
am: dbcbadbb99

Change-Id: Ia923cadf6131f4feeeff5b3d90ba0701c6ea8622
2016-11-17 00:37:01 +00:00
Jerry Zhang
12488ed15f Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204
am: 1faf15d422

Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff
2016-11-17 00:36:52 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
2016-11-17 00:24:41 +00:00
Jerry Zhang
5d77efb3d9 Clean up persistent usb state on boot. am: dfacad026d
am: b15490ac4d

Change-Id: I2fd38cd6b27685206f6aa5f11daecbc7654749d1
2016-11-17 00:23:47 +00:00
Jerry Zhang
1faf15d422 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
am: b37d826204

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366
2016-11-17 00:22:59 +00:00
Jerry Zhang
dbcbadbb99 Fixed handling of usb state during adb changes. am: 0269ebe0fe
am: 4389cb6c9a

Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
2016-11-17 00:22:53 +00:00
Ningyuan Wang
4a4213845b Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf am: 7cad272109
am: 5f72d153aa

Change-Id: Idf96f8abaed98608d8252484e9eba86d669ac7d4
2016-11-17 00:22:06 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b15490ac4d Clean up persistent usb state on boot.
am: dfacad026d

Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
2016-11-17 00:11:15 +00:00