16807 Commits

Author SHA1 Message Date
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
2014-04-24 16:19:27 -07:00
Dianne Hackborn
ffcda10861 Add support for muliple active development codenames.
The resource API level is also bumped by the number of
active codenames there are.

Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
2014-04-24 16:18:43 -07:00
Christopher Tate
353e39a973 Fix native-lib dir assignment & updating
The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs.  The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.

Bug 14233983

Change-Id: I76c3249c72ecc055115d430529d386599e52ae42
2014-04-24 16:08:12 -07:00
Kenny Root
97efc15b32 Merge "PackageManager: remove GET_CERTIFICATES boolean" 2014-04-24 20:51:49 +00:00
Kenny Root
07c79fcc7f PackageManager: remove GET_CERTIFICATES boolean
This is a really old debugging flag that is not useful and also
dangerous.

Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
2014-04-24 13:40:11 -07:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +00:00
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio.
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
2014-04-24 11:21:30 -07:00
Craig Mautner
5e6e27edb7 Merge "Take screenshots of pausing activity" 2014-04-24 17:44:42 +00:00
Craig Mautner
f6ead5d62e Take screenshots of pausing activity
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.

Fixes bug 13410507.

Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
2014-04-24 10:39:36 -07:00
Alexandra Gherghina
80021878a8 Merge "Fix two potential NPEs in DeviceInfo" 2014-04-24 17:11:51 +00:00
Alexandra Gherghina
a4fcb44033 Fix two potential NPEs in DeviceInfo
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
2014-04-24 17:55:30 +01:00
Michael Kolb
83474f5b4d am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
  Use rotation to position circular display mask
2014-04-24 16:16:59 +00:00
Michael Kolb
0fc5f86950 am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask
2014-04-24 16:13:41 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
2014-04-24 09:01:19 -07:00
Kenny Guy
1c29903198 Merge "Fix bug with getLauncherActivities ignoring packageName." 2014-04-24 15:49:08 +00:00
Craig Mautner
6c66d1fd79 am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '7e28afd9568c590c7110f83b252dbb77f165fcb3':
  Force ActivityView activities to start in new task
2014-04-24 15:43:37 +00:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
2014-04-24 08:42:32 -07:00
Alexandra Gherghina
e255d7399f Merge "Modify getUserProfiles to return only enabled profiles:" 2014-04-24 15:22:09 +00:00
John Spurlock
10459a5411 Merge "Move notification listener management into helper." 2014-04-24 14:32:41 +00:00
Kenny Guy
1a4e0b9980 Fix bug with getLauncherActivities ignoring packageName.
Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
2014-04-24 12:28:04 +01:00
Craig Mautner
7e28afd956 am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
  Force ActivityView activities to start in new task
2014-04-24 09:11:30 +00:00
Alexandra Gherghina
385124d8ce Modify getUserProfiles to return only enabled profiles:
Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.

Bug: 13755441
Bug: 13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
2014-04-24 10:07:51 +01:00
John Spurlock
b408e8ecd2 Move notification listener management into helper.
Part of a larger effort to reuse service management code.  This is
mostly algebraic, simply move code related to listener management
into a new helper, and cut the backreference to NoMan.  Put
user-profile code into reusable inner helper, and common uid-checking
code into a new static util helper.

Resist the urge to rewrite / reformat, but replace HashSet with
ArraySet.

Bug:13743109
Change-Id: I59e0131f632c3bbf555b5276dc5092422113cdc3
2014-04-23 21:12:45 -04:00
Winson Chung
1b244f44a7 Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)" 2014-04-23 21:35:33 +00:00
Winson Chung
3b3f464445 Piping through ability for an Activity to remove its own task. (Bug 13735914)
Change-Id: Iefcd4fbe68748195de8ee37ee2b6edef55276603
2014-04-23 13:57:06 -07:00
Craig Mautner
7f7bdb2712 Force ActivityView activities to start in new task
Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
2014-04-23 13:55:36 -07:00
Emily Bernier
8a0fa6e823 Merge "Allow device or profile owner app to modify user restrictions." 2014-04-23 18:27:45 +00:00
Emily Bernier
7a2b4d11c7 Allow device or profile owner app to modify user restrictions.
Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448
2014-04-23 14:20:15 -04:00
Neil Fuller
ceb5d17f6a am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
  Changes to support asynchronous close interruption
2014-04-23 16:51:47 +00:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
2014-04-23 16:48:34 +00:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
2014-04-23 16:45:15 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
2014-04-23 16:40:35 +00:00
Jeff Sharkey
21de56a946 Add directory selection to DocumentsProvider.
Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
2014-04-22 22:18:21 -07:00
Jeff Sharkey
846318a325 Allow prefix-based Uri permission grants.
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
2014-04-22 21:06:49 -07:00
Jeff Brown
caeaa37594 am 62271b95: am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '62271b95222c5d67868ac1b3bbd8851d4fa18454':
  Fix HDMI hotplug display blanking behavior.
2014-04-23 01:25:40 +00:00
Jeff Brown
62271b9522 am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.
2014-04-23 01:22:26 +00:00
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior.
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
2014-04-22 18:07:24 -07:00
Ying Wang
96997a6148 am d12bf275: am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit 'd12bf27575bc2df114abc0aadd1a62ff476b5a42':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
2014-04-23 00:15:52 +00:00
Ying Wang
d12bf27575 am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
2014-04-23 00:11:52 +00:00
Ying Wang
b081a59a0f Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
2014-04-22 15:20:16 -07:00
Nick Kralevich
9a492393df am 5246f459: am d267c1a0: Merge "remove unneeded import statements."
* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
  remove unneeded import statements.
2014-04-22 21:15:10 +00:00
Nick Kralevich
d236d625b4 am 3ab7882a: am a67d4a6e: Merge "remove unused import."
* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
  remove unused import.
2014-04-22 21:14:59 +00:00
Ruchi Kandoi
62b8a49856 Adds Content Observer for the Low power mode in developer options.
Change-Id: Ibed319e734340dfd5348dbeb8fe20c01b1adaac5
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-04-22 20:55:31 +00:00
Nick Kralevich
5246f4599a am d267c1a0: Merge "remove unneeded import statements."
* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.
2014-04-22 19:52:21 +00:00
Nick Kralevich
3ab7882a57 am a67d4a6e: Merge "remove unused import."
* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
  remove unused import.
2014-04-22 19:52:18 +00:00
Nick Kralevich
d267c1a06f Merge "remove unneeded import statements." 2014-04-22 19:24:47 +00:00
Nick Kralevich
c826257bf3 remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.

Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
2014-04-22 12:17:51 -07:00
Nick Kralevich
8cb5abcfde remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.

Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
2014-04-22 12:10:24 -07:00