227998 Commits

Author SHA1 Message Date
Daichi Hirono
c0ae45be04 Add device document to MtpDatabase.
BUG=26175081

Change-Id: Ida91c50f7e33d7b300a32ee318b6f3837edf6606
2015-12-15 16:16:50 +09:00
Daichi Hirono
f4f09b1ada Merge "Use column name instead of index in MtpDatabaseTest for readability." 2015-12-15 07:15:31 +00:00
Daichi Hirono
9984ebd6d3 Use column name instead of index in MtpDatabaseTest for readability.
BUG=26194040

Change-Id: I58a6e59f4784fcc81988093bb113e721e36e46d0
2015-12-15 16:02:27 +09:00
Tomasz Mikolajewski
3def94866e Merge "Add support for copying virtual files in DocumentsUI." 2015-12-15 05:06:45 +00:00
Jun Mukai
81245161a0 Merge "Make public pointer icon API with custom icons." 2015-12-15 04:46:53 +00:00
Robert Carr
ce4f2f18b7 Temporary enable logging for monkey testing
Temporary enable logging for tracing 26157153 in monkey testing.

Bug: 26157153
Change-Id: I85aef42c426ceaa831b7919a37dd35ef78e9c779
2015-12-14 20:08:09 -08:00
Rob Carr
28ba383214 Merge "Move window replacement tracking to window state." 2015-12-15 04:05:19 +00:00
Jun Mukai
d4eaef7f4c Make public pointer icon API with custom icons.
BUG: 25778347, 23804184
Change-Id: If138b97c750c912e9848412c27b65004899961eb
2015-12-14 19:45:10 -08:00
Tomasz Mikolajewski
470a3dbc5d Add support for copying virtual files in DocumentsUI.
Bug: 26147488
Change-Id: I09cf010de7267fbdba6e3fcd0f300b0ecce19d10
2015-12-15 11:21:04 +09:00
Daichi Hirono
7d0b3cdd70 Merge "Stop reopening MTP devices." 2015-12-15 02:12:31 +00:00
Daichi Hirono
be38848969 Stop reopening MTP devices.
BUG=26175809

Change-Id: I45a51c0623b349f12e7d3cf787a89b089f230bc1
2015-12-15 11:10:37 +09:00
Daichi Hirono
42a5e0e3a4 Merge "Integerate mapping methods for root/child documents into the same methods." 2015-12-15 02:08:50 +00:00
Daichi Hirono
7a375c407f Integerate mapping methods for root/child documents into the same
methods.

The integrated methods will be used to add device documents as well as
root/child documents.

BUG=26175081

Change-Id: Ibf474cfbc41df402a2958e9efcdd0061f07f5ced
2015-12-15 11:06:20 +09:00
Roozbeh Pournader
dad100699a Negotiate locales during Resources contruction and updates
This also adds a new API to Resources, to get the resolved locale
from the Resources.

Bug: 25800576
Change-Id: I431f1c1b4b6775fcbc097936d0d607400db47f7d
2015-12-14 17:20:47 -08:00
Bryce Lee
5a0fed6841 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 am: 36393a5674 am: 4ab8b0696a
am: 0510ad1bc9

* commit '0510ad1bc9a2da4fa84f1a5417a218dba48563e3':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-15 01:17:28 +00:00
Jeff Davidson
1efb133581 Relax permissions around NetworkStatsManager APIs.
Currently, access to network usage history and statistics requires a
signature|privileged permission, an AppOps bit (associated with the
PACKAGE_USAGE_STATS permission), or device/profile ownership. Once
access is granted via one of these mechanisms, it generally applies to
any UID running in the same user as the caller.

This CL expands access as follows:

-Any app can access its own usage history with no extra requirements.
-Carrier-privileged applications can access usage history for the
entire device.
-Device owners can access per-UID breakdowns for usage. Previously
they could access the summary for the whole device, but not the
individual breakdowns.

We simplify the permission model by defining three access levels -
DEFAULT (own app only), USER (all apps in the same user), and DEVICE
(all apps on the device), and propagate these levels throughout.

Finally, this CL fixes an apparent bug in
NetworkStatsSerice#hasAppOpsPermissions - if the AppOp bit was in
MODE_DEFAULT, hasAppOpsPermission would always return false instead of
falling back to the PackageManager permission check.

Bug: 25812859
Bug: 25813856
Change-Id: Ic96e0776e2a4215a400163872acea1ededfaced9
2015-12-14 17:16:37 -08:00
Jeff Sharkey
63b0318e4b Merge "Protect some more broadcasts." 2015-12-15 01:06:20 +00:00
Andreas Gampe
0f84c9032d Merge "Frameworks/base: Some cleanup in PackageManagerService" 2015-12-15 01:04:49 +00:00
Jeff Sharkey
4267eacc3b Protect some more broadcasts.
Bug: 26144973
Change-Id: Ic05bca52913ee5545719f0f24bed5b359f31259f
2015-12-14 18:03:04 -07:00
Tomasz Mikolajewski
970bf27531 Merge "Simplify CopyService in DocumentsUI." 2015-12-15 00:55:44 +00:00
Filip Gruszczynski
e16c2fb96f Merge "Refactor checking for inserting activity into existing task." 2015-12-15 00:32:14 +00:00
Bryce Lee
0510ad1bc9 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 am: 36393a5674
am: 4ab8b0696a

* commit '4ab8b0696a4383b7dec2fc2dc4f17596bcd9216a':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-15 00:11:06 +00:00
Filip Gruszczynski
dc39490502 Refactor checking for inserting activity into existing task.
Inserting into existing task is a large chunk of code with very deep
indentation. This removes 2 levels of indentation by checking them
together and returning final result.

CL also includes moving some of the permission checking code into a
separate method.

Change-Id: Ieba82ef9e410094de229b0d25b2a60bf18a1e869
2015-12-14 16:07:36 -08:00
Wale Ogunwale
5144d154b5 Merge "Still save config on client side when not reporting to activity." 2015-12-15 00:06:02 +00:00
Bryce Lee
4ab8b0696a Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39
am: 36393a5674

* commit '36393a5674bf50b351b5961a194ce2814ca00140':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-14 23:57:38 +00:00
Bryce Lee
36393a5674 Allow access to deprecated LOCK_PATTERN_ENABLED flag.
am: 4614596a39

* commit '4614596a395b6c86fff3f35a07edda2e848d743c':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-14 23:43:54 +00:00
Wale Ogunwale
14e811f5d9 Still save config on client side when not reporting to activity.
On the client side we have additional protection not to save new
configuration reported by activity manager if the app isn't handling
any of the configuration change that occurred. This is done because
the activity is expected to relaunch for any configuration it doesn't
handle. However, with multi-window support the activity manager doesn't
relaunch an activity if the configuration change doesn't cross a resource
threshold.
We now save the configuration on the client side when activity manager
tells us not to report the changes to the app (i.e. configuration
changed, but wasn't big enough for relaunch)

Bug: 23904868
Change-Id: I54f65cad65c1b8ed5da1165a8b2816adbea41d4b
2015-12-14 15:04:22 -08:00
Bryce Lee
4614596a39 Allow access to deprecated LOCK_PATTERN_ENABLED flag.
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.

Bug: 26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
2015-12-14 14:39:10 -08:00
Michael Wright
aa1a94daaa Make KEYCODE_SPACE a confirm key.
By default space should "click" the focused item. This behavior also
applies to GridView and ListView if the items are clickable, but will
continue the previous behavior of scrolling if it's just a list of
items you can't really interact with.

Change-Id: Ic3a0334614d1dc68ff98bc4b1fb1ae2f961f71af
2015-12-14 17:30:25 -05:00
Roozbeh Pournader
3cac67c074 Merge "Load Portuguese and German hyphenation in Hyphenator" 2015-12-14 21:54:26 +00:00
Greg Hackmann
40aa9f1b98 Merge "Trace SQLite operations" am: 6fe06606c4
am: 0f13ddfdff

* commit '0f13ddfdffacffe1c8bcce3adba87dd32b0ab92a':
  Trace SQLite operations
2015-12-14 13:49:02 -08:00
Greg Hackmann
0f13ddfdff Merge "Trace SQLite operations"
am: 6fe06606c4

* commit '6fe06606c4df39487d240cc1fa4ac6d944b33137':
  Trace SQLite operations
2015-12-14 13:37:30 -08:00
Jun Mukai
7767322565 Merge "Allow specifying pointer shape from xml resource." 2015-12-14 21:34:28 +00:00
Roozbeh Pournader
a1c0a82ba6 Load Portuguese and German hyphenation in Hyphenator
This also extends the fallback locale matching algorithm to consider
language+variant before just the language, so asking for "de-AT-1901"
would result in trying "de-1901" before trying "de".

Bug: 26169902
Change-Id: I55e5a73e7ac730d0bc14204126cbb3cc6ce0e9f1
2015-12-14 21:27:46 +00:00
Andreas Gampe
9b041747d1 Frameworks/base: Fix typo in AccountManagerService
Fix an unintended tautology.

Bug: 19797138
Change-Id: Iec19b5c9c80b9f49a61b0dc3c9a9d5c13c84a992
2015-12-14 13:18:38 -08:00
Greg Hackmann
6fe06606c4 Merge "Trace SQLite operations" 2015-12-14 21:12:52 +00:00
Jeff Davidson
b7e3fd80e5 Fix bit-rotted NetworkStatsServiceTest.
Breakages:

-ag/574873 - Renders testReportXtOverDev obsolete as this is no longer
             a supported mode. Test has been removed.
-ag/600223 - Tests were sending a CONNECTIVITY_ACTION bcast to trigger
             a call to updateIfaces(), but the listener was removed.
             Tests now call forceUpdateIfaces() directly.
-ag/648284 - Calls to get VPN info were not mocked.

Change-Id: I309f2b5d006549104cb1d3cb83e99363dd6dac16
2015-12-14 13:05:30 -08:00
Greg Hackmann
e12350faf7 Trace SQLite operations
Inefficient SQLite use can have non-obvious effects on performance.  For
example, insert and update operations can trigger a surprising number of
fsync() calls, especially if they're not grouped together into
transactions.

Add tracepoints around SQLite operations, to make it easier to pinpoint
their effects on the rest of the system.

Change-Id: I30cc3d02eca264e46dcc09ca7512a32519543834
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-12-14 12:32:26 -08:00
Jun Mukai
80fdc1bd36 Allow specifying pointer shape from xml resource.
Bug: 25777986
Change-Id: I8be5d2cb130299b0ea8f4f4d3dc582143f7ff553
2015-12-14 12:09:27 -08:00
Wale Ogunwale
5ad34c3e5b Merge "Fixed bug with task record not updating to fullscreen sometimes" 2015-12-14 20:07:42 +00:00
Chad Brubaker
f58f540f7a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-12-14 12:06:28 -08:00
Andreas Gampe
e37f2c6e11 Merge "Frameworks/base: Use Arrays.toString" 2015-12-14 20:05:27 +00:00
Chad Brubaker
827c3498eb Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f121e
am: a1c0bea895

* commit 'a1c0bea89518d020b615740215bff7fc4356e991':
  Use the application's usesCleartextTraffic flag
2015-12-14 12:05:20 -08:00
Andreas Gampe
e6748ce31f Frameworks/base: Use Arrays.toString
Fix a couple of cases where Arrays.toString should be used.

Bug: 19797138
Change-Id: I905fc79e63face9b26975320a92086c732bf6316
2015-12-14 12:04:26 -08:00
Chad Brubaker
4b4a252931 Merge "Check for null hostnames in RootTrustManager" am: 49ce7dc2ba
am: 15ea45c848

* commit '15ea45c848fbf9e70bbfe6afbfb25d39ce406c80':
  Check for null hostnames in RootTrustManager
2015-12-14 12:03:22 -08:00
Chad Brubaker
a1c0bea895 Merge "Use the application\'s usesCleartextTraffic flag"
am: d16f5f121e

* commit 'd16f5f121e560d9f18411cbdd3fa4fb48681c0c2':
  Use the application's usesCleartextTraffic flag
2015-12-14 11:57:29 -08:00
Chad Brubaker
15ea45c848 Merge "Check for null hostnames in RootTrustManager"
am: 49ce7dc2ba

* commit '49ce7dc2baa9ee867fc7b78301c65fab2168a9b2':
  Check for null hostnames in RootTrustManager
2015-12-14 11:55:05 -08:00
Chad Brubaker
d16f5f121e Merge "Use the application's usesCleartextTraffic flag" 2015-12-14 19:31:08 +00:00
Chad Brubaker
49ce7dc2ba Merge "Check for null hostnames in RootTrustManager" 2015-12-14 19:30:44 +00:00
Winson Chung
de750de531 Only show historical tasks in history.
- Also only show the history button if there are
  historical tasks (and reflect that in the 
  button text)

Change-Id: I7b9dcf79e2feef61f96b720f586144de4c5033e3
2015-12-14 14:23:21 -05:00