drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
296,382 Commits 1 Branch 0 Tags
Commit Graph

296382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
769ccdbc1e Merge "Avoid starving RT anims" 2016-11-17 22:03:18 +00:00
TreeHugger Robot
29993074b0 Merge "Keep track of admin actions for DO disclosures" 2016-11-17 21:40:46 +00:00
TreeHugger Robot
3613a0caee Merge "Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API" 2016-11-17 21:34:08 +00:00
TreeHugger Robot
b8bf61c84d Merge "Added configuration for VT downgrade/tear down when data disabled" 2016-11-17 21:05:37 +00:00
Sean Stout
aaf30fb8ed Merge "Update ringtone picker strings." 2016-11-17 20:57:53 +00:00
TreeHugger Robot
8068bfeae2 Merge "Doze: Fix WakeLock bug" 2016-11-17 20:57:33 +00:00
TreeHugger Robot
5bec219934 Merge "Phase-2 API takes a hostname" 2016-11-17 20:39:54 +00:00
TreeHugger Robot
61e5f71292 Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()" 2016-11-17 20:31:53 +00:00
Bartosz Fabianowski
b21b241f0f Keep track of admin actions for DO disclosures 
This CL adds bookkeeping to DPMS which will allow us to tell the user
in the Settings UI whether/when the admin requested a bug report or
retrieved logs from the device.

Bug: 32692748
Test: Full DevicePolicyManagerTest unit test coverage; end-to-end tests
        will follow as Settings CTS verifier tests

Change-Id: I89728fce4b7e0ff061b354c73caf3742e95a3a3e
 2016-11-17 20:52:03 +01:00
Brad Ebinger
972d866b53 Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657 am: 3ae84b6efe 
am: 75553432d4

Change-Id: Ic2a03399b6a0e8ae455d75ce134a2bb276e01c37
 2016-11-17 19:51:28 +00:00
Sudheer Shanka
d9a42f2e2c Merge "Remove transaction ids in IApplicationThread." 2016-11-17 19:49:39 +00:00
Bartosz Fabianowski
1133424c2b Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API 
Settings needs to access a variant of getInstalledApplications() which
takes a |userId| argument. Since this is not currently exposed by
PackageManager, Settings calls into PackageManagerService directly. This
is ugly and breaks the regular abstraction layer hierarchy.

The CL fixes the problem by exposing the required variant of
getInstalledApplications() as a hidden API, analogously to what was done
before with getInstalledPackages().

Bug: 32692748
Test: Will be CTS-verifier-tested together with Settings
Change-Id: Id9c4e8e18524d312159821f1a4d5527263c7e950
 2016-11-17 20:49:16 +01:00
Brad Ebinger
75553432d4 Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657 
am: 3ae84b6efe

Change-Id: I7eba86dfbf8845aae8bafddc4a6bc5f94b66bc2b
 2016-11-17 19:43:08 +00:00
Brad Ebinger
3ae84b6efe Merge "Readability improvements in Logging" am: d51df736f6 
am: 90b6e78657

Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972
 2016-11-17 19:35:08 +00:00
Brad Ebinger
90b6e78657 Merge "Readability improvements in Logging" 
am: d51df736f6

Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
 2016-11-17 19:29:17 +00:00
Brad Ebinger
d51df736f6 Merge "Readability improvements in Logging" 2016-11-17 19:18:00 +00:00
Dimitry Ivanov
fcb4024e65 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a am: b8e43f60c2 
am: c8ff9b50ed

Change-Id: Id5eef00a490e971b025937c34b372cd272c72087
 2016-11-17 19:11:20 +00:00
Derek Sollenberger
e92d4045eb Merge "Update pinImages to report when GPU resource limits are exceeded." 2016-11-17 19:08:50 +00:00
Przemyslaw Szczepaniak
167a519143 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c am: d771b36951 am: 728ce76156 
am: ab8c119689

Change-Id: I2cd2184418b790a2ff05ca81cde7e9b373fc3b7a
 2016-11-17 19:06:06 +00:00
Dimitry Ivanov
c8ff9b50ed Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a 
am: b8e43f60c2

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
 2016-11-17 19:06:02 +00:00
Pavlin Radoslavov
9cfb18a0ff Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8 am: ffb6a4beab 
am: c51275a5e5

Change-Id: I26e97c6f6f13b5b37134763f95131e184530b3ad
 2016-11-17 19:03:32 +00:00
Peter Qiu
8b75eeef42 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc am: 120cb677f0 
am: 9562122699

Change-Id: I3840e74b17bfe22b8b62597b6f98c4cee79e14f1
 2016-11-17 19:02:30 +00:00
Jerry Zhang
686dcd0732 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422 am: 12488ed15f 
am: 5ca0000141

Change-Id: I30febc710c88d6ca02b839f5d2afc41d2f70a9b3
 2016-11-17 19:01:21 +00:00
Dimitry Ivanov
b8e43f60c2 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 
am: 6a5e1a7f4a

Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
 2016-11-17 18:57:58 +00:00
Todd Kennedy
194e4eeb0e Phase-2 API takes a hostname 
For phase-2, instead of taking a hash prefix, we will send the
hostname to the resolver.

Bug: 25119046
Test: build & install the sample resolver and run 'adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d "https://www.tripadvisor.com/Tourism-g33020-San_Jose_California-Vacations.html"'
Change-Id: I6e621139e182f9a9cfcf608c26d4763f1379bdb2
 2016-11-17 10:56:37 -08:00
Dimitry Ivanov
6a5e1a7f4a Merge "Fix coretests: Remove dependency on libnativehelper" 
am: f68cb55cc1

Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
 2016-11-17 18:50:29 +00:00
Jerry Zhang
4c4666c5ef Merge commit '54f33d9af22e62629798555a3cde4e784bd8ba54' into manual_merge_54f33d9 
Change-Id: Icfd9bc3eff034d33e733dbb8386949c9ec345e58
 2016-11-17 10:48:26 -08:00
Jack Yu
2030cd9f5f 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.

Test: telephony unit tests
bug: 32880745
Change-Id: Idd33a022b5a31cbc58592587bcb496bd78923ae7
 2016-11-17 10:42:02 -08:00
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
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
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