Commit Graph

51437 Commits

Author SHA1 Message Date
Jim Miller
84a2b10291 am 64cd70d5: am b62dc82b: Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
* commit '64cd70d57acd171d3c0b071c04c0c972cc4dd043':
  Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
2015-04-30 02:22:16 +00:00
Jim Miller
b62dc82b0c Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit 0ecd5c20d9)
2015-04-30 01:53:11 +00:00
Svet Ganov
03f8542e7e am 5242ef65: am 82863f13: Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev
* commit '5242ef65bed03eaf8ef61261853f09efc8566118':
  Add permission to ap op mappings for all runtime permissions.
2015-04-30 01:01:53 +00: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
Svet Ganov
82863f137e Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev 2015-04-30 00:41:40 +00:00
Svet Ganov
6e8f67c444 Add permission to ap op mappings for all runtime permissions.
Change-Id: I1b41fac9405352f135b3d0137cc924ce51388e1e
2015-04-29 17:35:19 -07:00
Mike Lockwood
3d7765cd6f am c7bf0a6a: am 3f9dc836: Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
* commit 'c7bf0a6afb8918fa6fdd469cbd6383188b1d2564':
  MidiFramer: Support realtime messages contained within SysEx messages.
2015-04-30 00:27:36 +00: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
Alan Viverette
32cc8b2081 am d232e636: am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit 'd232e636f24b8bc67dde8decd006d542bafb15f8':
  Stash modulation alpha until ColorStateList has resolved base color
2015-04-30 00:16:27 +00:00
Alex Klyubin
8fa0eecc4f am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '789d9dc733d4a3a15e83eb2aa0e49f548fe81618':
  Add KeyPermanentlyInvalidatedException.
2015-04-30 00:16:10 +00:00
Mike Lockwood
3f9dc836c4 Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev 2015-04-30 00:14:26 +00: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
Alan Viverette
0f1a3972c1 Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev 2015-04-29 23:53:19 +00:00
Alex Klyubin
33c9dde90d Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev 2015-04-29 23:48:14 +00: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
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
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
Ben Kwa
0c04cf9aae am ac151b1e: am 94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
* commit 'ac151b1e9945599982c6cf871fd82817db7297fb':
  Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
2015-04-29 22:40:29 +00:00
Alan Viverette
f601440e21 Stash modulation alpha until ColorStateList has resolved base color
Fixes an issue where specifying an explicit modulation alpha and a
theme-dependent base color discarded the modulation alpha during
applyTheme().

Sets the YOU MESSED UP YOUR THEME color to magenta, which matches the
behavior for RippleDrawable and should expose any remaining issues in
a painfully obvious way.

Bug: 20690409
Change-Id: I7a44f4bc4a5a85be6d3f27087b2d6c9ea12e1d29
2015-04-29 15:36:11 -07:00
Amith Yamasani
fa4eda443e Merge "Remove network access for idle apps" into mnc-dev 2015-04-29 22:31:19 +00:00
Adrian Roos
666dbb43b9 am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit 'b00540dc5c2d475fd6a6833f1a805cb0a683e264':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure
2015-04-29 22:22:17 +00:00
Ben Kwa
94d07cb7ef Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev 2015-04-29 22:12:08 +00:00
Adrian Roos
e632dc35d8 Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev 2015-04-29 21:57:52 +00:00
Svet Ganov
2c372ef024 am 104a23c5: am e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '104a23c544f2841a752bf0c004483ead5edd34ff':
  Add API to get app op for a permission
2015-04-29 21:39:35 +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
Svet Ganov
e35380839e Merge "Add API to get app op for a permission" into mnc-dev 2015-04-29 21:15:25 +00:00
Adrian Roos
c39b4fc686 Clarify javadoc of isKeyguardSecure and isDeviceSecure
Bug: 20642788
Change-Id: I1114150cd645ee3de8e4617cdb79ff351e01b9df
2015-04-29 14:02:55 -07: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
Dianne Hackborn
9ac2718e7d Merge "Implement user-settable power save whitelist." into mnc-dev 2015-04-29 20:33:51 +00:00
Ben Kwa
192b3d4f90 Properly unparcel the PFDs passed to
android.content.ContentProviderProxy.openFile.

BUG=20693984

Change-Id: Id089d218057d5439da1bd5bf0ce3991059c1ecad
2015-04-29 13:30:25 -07: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
Abodunrinwa Toki
ef586c12d1 am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit 'eaa44818adbe8c6ee850c530fc70809502340469':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
2015-04-29 20:21:57 +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
Abodunrinwa Toki
05a56db39d Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 2015-04-29 19:57:48 +00: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
Alex Klyubin
708fc94045 Add KeyPermanentlyInvalidatedException.
This enables users of AndroidKeyStore crypto to differentiate between
the key being unusable until the user is authenticated
(UserNotAuthenticatedException) and the key being permanently unusable
(KeyPermanentlyInvalidatedException). The latter is the case when the
secure lock screen has been disabled or reset, and, for keys that
require user authentication for every use, when a new fingerprint is
enrolled or all fingerprints are unenrolled.

NOTE: The KeyPermanentlyInvalidatedException subsumes/replaces the
NewFingerprintEnrolledException which has thus been removed. There
is no way to find out whether a key was permenently invalidated
specifically because a new fingerprint was added.

Bug: 20642549
Bug: 20526234
Change-Id: I0206cd99eef5c605c9c4d6afc5eea02eb3b1fe6b
2015-04-29 12:44:10 -07:00
Chris Craik
e58e0e50ef am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '737f0b22bec07297eea782ea2cb29b056e849efc':
  Unify View alpha implies clipping behavior
2015-04-29 19:42:49 +00:00
Dianne Hackborn
0b4daca9ba Implement user-settable power save whitelist.
The whitelist is now maintained by DeviceIdleController,
which is moving out into its own independent system service.
Network stats now queries it for the whitelist, instead of
collecting that itself.

Also did a few improvements in alarm manager -- made the
code for moving alarms out of the pending list more robust,
and fixed the debug output to always print the contents of
the pending list even if we aren't in a pending state.  (That
would have helped me identify the problem much earlier.)

Change-Id: I0f7119d4c553c3af4d77b2f71246fa6e2c13c561
2015-04-29 12:38:09 -07:00
Svet Ganov
5686780404 Merge "Respect the record audio app op - framework" into mnc-dev 2015-04-29 19:34:06 +00:00
Chris Craik
7201bf2b7e Merge "Unify View alpha implies clipping behavior" into mnc-dev 2015-04-29 19:23:41 +00:00
Abodunrinwa Toki
c23ac32601 DO NOT MERGE: Minor fixes to FloatingToolbar.
* Changes to isShowing() method.
* Changes to initial content visibility on show().

Change-Id: I1b20cd5a3fc86ae7427b55c44efd3cc1118148ae
2015-04-29 17:57:06 +00:00
Abodunrinwa Toki
8020631fa4 am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
* commit '45b04c1a5ef4f21b14b40dd0c1035933188da322':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
2015-04-29 17:43:40 +00:00
Cedric Ho
94ae5f3c08 am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit 'fbad902aad433f4eaa82192019fef1dcaba26d47':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
2015-04-29 17:43:34 +00:00
Abodunrinwa Toki
47ea8b3d6b Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 2015-04-29 17:26:29 +00:00
Cedric Ho
80fa2cc8a9 Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev 2015-04-29 17:19:40 +00:00
Andrei Stingaceanu
da8d35cd31 am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit '78a4348a535e530ae77c0e7777247d495596be7c':
  DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
2015-04-29 16:47:25 +00:00
Andrei Stingaceanu
eea5a9e0de Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev 2015-04-29 16:21:16 +00:00