26162 Commits

Author SHA1 Message Date
John Reck
0385dc8d12 am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '1d8aae3b1924b2340250bdffe491819a26eea5fe':
  Change how Java Bitmaps are accessed in a few places
2015-04-30 21:20:51 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Mady Mellor
04f2fe3958 am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev
* commit 'd73f05f5f0ec3a212e4390d790c0229892c21930':
  Add onStylusButtonPress listener to View
2015-04-30 20:36:06 +00:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-30 12:46:57 -07:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Svetoslav
cae8686c88 am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev
* commit '0165cf4d719ab6560507a18ffd7375b0ad850622':
  Add use fingerprint app op - framework
2015-04-30 18:39:32 +00:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Jean-Michel Trivi
c8efc4490d am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
* commit '3d42d2380f5af53ce299610e27f40a8d88930c89':
  AudioService receives callback for dynamic policy mix state changes
2015-04-30 17:14:30 +00:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
John Spurlock
0f4c6a8bdf am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
  Zen: New event condition data model.
2015-04-30 16:16:13 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
2015-04-30 11:42:11 -04:00
Zoltan Szatmary-Ban
2aab6de5a8 am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev
* commit '795ec67721c565ffa15a4c283428227c954e7a5f':
  Fix potential NPE on devices without DPMS
2015-04-30 15:20:27 +00:00
Benjamin Franz
f225e6c6af am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev
* commit '550ab61ca54cc0366842263563f8061d56931fcd':
  Add package name extra to PackageInstaller callback
2015-04-30 15:20:19 +00:00
Jeff Sharkey
a54020c7ae am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev
* commit '508c9fecb6644a533ae63ff52596f484b1fe2806':
  New "frozen" state during app move/upgrade.
2015-04-30 15:19:41 +00:00
John Spurlock
df7f02b6e0 am ad61b833: Merge "Fix no vibration during shutdown."
* commit 'ad61b8336aa9627a6ae19580bbdc370dc8bd6810':
  Fix no vibration during shutdown.
2015-04-30 12:47:20 +00:00
John Spurlock
ad61b8336a Merge "Fix no vibration during shutdown." 2015-04-30 12:22:41 +00:00
Zoltan Szatmary-Ban
780a9b9e12 Merge "Fix potential NPE on devices without DPMS" into mnc-dev 2015-04-30 09:48:36 +00:00
Zoltan Szatmary-Ban
cccbe885b9 Fix potential NPE on devices without DPMS
Bug: 20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
2015-04-30 10:38:24 +01:00
Benjamin Franz
dc4ad271f9 Merge "Add package name extra to PackageInstaller callback" into mnc-dev 2015-04-30 08:33:47 +00:00
Jeff Sharkey
e31b820dad New "frozen" state during app move/upgrade.
This replaces mOperationPending, which was in an odd place.  It adds
a new PackageSetting.frozen flag that is a last-ditch effort to
prevent ActivityManager from starting an app while it's being moved
or upgraded.

Also provides clearer guarding around all upgrades by freezing,
killing, upgrading, then unfreezing.

Bug: 20275579
Change-Id: I28bb0359a6f4e05080fb336b18dd2a249509d989
2015-04-29 22:03:37 -07:00
Jeff Sharkey
21a3088948 am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev
* commit '1df4dca2982acecb526495b30a605d97786df0de':
  Returning to wizard, split move events.
2015-04-30 01:01:48 +00:00
Jean-Michel Trivi
5a56109d1f AudioService receives callback for dynamic policy mix state changes
AudioService registers a callback for dynamic policies from
  AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.

Bug 20226914

Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
2015-04-29 17:56:19 -07:00
Dianne Hackborn
cd0f18a8eb am 4d146ed2: am f7b795ca: Merge "Update use of procstate for services." into mnc-dev
* commit '4d146ed236b700da85197242b557c052032d16da':
  Update use of procstate for services.
2015-04-30 00:27:31 +00:00
Jeff Sharkey
50a0545479 Returning to wizard, split move events.
Finish wiring up notifications to jump back into in-progress wizard
flow, using moveId as identifier.

Split move events back into separate creation and progress events,
and pass details as bundle to pass extra stuff like UUID.  Null
package still means moving primary storage.

Add explicit "volume forgotten" event for PackageManager to clean
up internal state with.

Plumb through internal path reported by vold, and bring back FUSE
bypass rewriting optimization.

Bug: 19993667
Change-Id: I0f43edbba36c58c5cd33550022c54c4eb9f01a48
2015-04-29 17:24:12 -07:00
Dianne Hackborn
f7b795ca1a Merge "Update use of procstate for services." into mnc-dev 2015-04-30 00:08:45 +00:00
Dianne Hackborn
d69e4c1460 Update use of procstate for services.
Now that we have a separate foreground service proc state
(above a sleeping top app), update various system services
to put their bindings into this state when appropriate.

There are two new bind flags for this -- one that just always
makes it a foreground service, another that only does it when
the device is awake (useful for things like the wallpaper).

And with all of that, tweak network policy manager to only
include apps that are at least foreground service state when
in power save and device idle modes.  This will allow us to
further reduce the set of apps that have network access
(in particular not giving access to the current top app when
the screen is off), hopefully leading to even better battery
life.

Change-Id: I91d85a5c5ed64e856149e9a5d94a634a7925ec7f
2015-04-29 17:04:50 -07:00
Simranjit Singh Kohli
7b21b4cb23 am 850c1888: am 490d23bf: Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev
* commit '850c1888f5855b340e8e26c4d7bc0580644dbcb8':
  [Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
2015-04-29 23:28:16 +00:00
destradaa
49c4822360 am 8fcd6951: am db2af234: Merge "Update use of A-GPS modes in GpsLocationProvider b/20664846" into mnc-dev
* commit '8fcd695187c2895e2dd0a1a15994a730501d19c2':
  Update use of A-GPS modes in GpsLocationProvider b/20664846
2015-04-29 23:28:10 +00:00
Simranjit Singh Kohli
490d23bf55 Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev 2015-04-29 23:13:34 +00:00
destradaa
db2af23408 Merge "Update use of A-GPS modes in GpsLocationProvider b/20664846" into mnc-dev 2015-04-29 23:09:53 +00:00
Amith Yamasani
278886d50a am 3184b286: am fa4eda44: Merge "Remove network access for idle apps" into mnc-dev
* commit '3184b28648a782a3a037de90bc76f64839b91560':
  Remove network access for idle apps
2015-04-29 22:52:08 +00:00
Svetoslav
4af76a51d5 Add use fingerprint app op - framework
Change-Id: Ibbd1c70e1fc771b804a8b0099d29d4fbd8360966
2015-04-29 15:43:38 -07:00
Amith Yamasani
fa4eda443e Merge "Remove network access for idle apps" into mnc-dev 2015-04-29 22:31:19 +00:00
destradaa
bfb3bdb918 Update use of A-GPS modes in GpsLocationProvider
b/20664846

This change reflects the documentation changes made in gps.h for the
upcoming Android release.

Change-Id: Id3e04492febdabd42e91a12e221d1192947b8061
2015-04-29 14:49:39 -07:00
Wale Ogunwale
e41c6688a0 am 1ee30f6a: am 00758a3b: Merge "Some code clean-up." into mnc-dev
* commit '1ee30f6a7f61c0f4ae79f9f7f6e829c96f91870f':
  Some code clean-up.
2015-04-29 21:39:41 +00:00
Wale Ogunwale
00758a3b37 Merge "Some code clean-up." into mnc-dev 2015-04-29 21:24:46 +00:00
Amith Yamasani
15e47235c0 Remove network access for idle apps
Track apps going in and out of idle in the NetworkPolicyManagerService.
Apply DROP rules in firewall controller if app is to be blacklisted
for network access.

Firewall can now be in whitelist (old) or blacklist mode. When in
blacklist, it allows all by default and we can selectively DENY
some uids.

Track app idle in UsageStats and update periodically.
Track charging/discharging states.

TODO: Check for appidle temporary parole state

Bug: 20066058
Change-Id: Ia65d7544204b3bcb78a517310ef4adcc05aac6fb
2015-04-29 14:21:53 -07:00
Mike Lockwood
62b4cbceb3 am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043':
  MidiDeviceInfo: Add version string property
2015-04-29 21:15:25 +00:00
Dianne Hackborn
8756f9b34d am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '599a4e0ea864769e6cd1d04bd766c472b16be4c7':
  Implement user-settable power save whitelist.
2015-04-29 20:51:04 +00:00
Mike Lockwood
94582c5fb6 am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '973a70d7c9dd2cda38500880bbc3873f238f1fe3':
  UsbDevice: Add support for retrieving version string for a USB device
2015-04-29 20:50:58 +00:00
Mike Lockwood
e1d003958d Merge "MidiDeviceInfo: Add version string property" into mnc-dev 2015-04-29 20:50:35 +00:00
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
2015-04-29 13:44:34 -07:00
Dianne Hackborn
9ac2718e7d Merge "Implement user-settable power save whitelist." into mnc-dev 2015-04-29 20:33:51 +00:00
Mike Lockwood
f105f61dd9 Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 2015-04-29 20:27:50 +00:00
Mike Lockwood
c9bb40ea95 UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
2015-04-29 13:05:55 -07:00
Wale Ogunwale
c14624da8e Some code clean-up.
Change-Id: I626c4c40c32dbf43408e0649364dfe8be2bb2321
2015-04-29 12:55:46 -07:00
Svet Ganov
0dbaba6c3a am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '5e47c802ef1ac9437b012bc70701ffaf048cb399':
  Respect the record audio app op - framework
2015-04-29 19:55:31 +00:00