Commit Graph

47352 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Svet Ganov
fbf01f7796 Add API to get app op for a permission
Change-Id: Id75d8fca6654c694fb78d1b4a3564b01e90a4e78
2015-04-29 08:30:48 -07:00
John Reck
6e51f4bd71 am 6c921033: am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
* commit '6c9210332c259570259cd1a92c4ae95f9c298f32':
  Remove View:hasStaticLayer()
2015-04-29 15:11:33 +00:00
John Reck
b77a755112 Merge "Remove View:hasStaticLayer()" into mnc-dev 2015-04-29 14:48:28 +00:00
John Spurlock
23e46a4e8d am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '2d67b2887c0a279aa182646f0e23b176783a1aca':
  Volume: Simple dialog footer, DND in quick settings.
2015-04-29 14:27:19 +00:00
John Spurlock
8dbcda1b33 Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 2015-04-29 14:02:52 +00:00
John Spurlock
d9c75dba75 Volume: Simple dialog footer, DND in quick settings.
- Show DND tile by default, this is now the only
   place to manage DND modes / end conditions.
 - Remove super footer from volume dialog, replace with
   a simplified version that displays the current mode
   and allows ending DND.
 - Remove obsolete text-only footer from codebase.
 - Migrate remaining volume items into main resource files.
 - Rename "No interruptions" to "Total silence".
 - Add new user information banner for "Total silence"
 - Crude media filtering for Total Silence.
   (deeper muting changes will be done as a followup)
 - Disable volume dialog sliders completely if muted due
   to zen.
 - Cleanup ZenModePanel: assume embedded mode, remove
   expandable subhead
 - Remember "favorite" DND mode inside the DND config panel.
 - AudioService: consult ringer-mode-delegate before voluming
   down into silent.
 - Add new hour options to time-based exit conditions.
 - Volume dialog visual updates to move closer to final visuals.
 - Unify ringer=silent with DND.

Bug: 19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
2015-04-29 09:58:38 -04:00
Benjamin Franz
da8f7a176c am af275e15: am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
* commit 'af275e157abb8b3add62e5bf1827519820cdf238':
  Add status bar flag to disable quick settings
2015-04-29 09:35:38 +00:00
Benjamin Franz
c4aa3c781a Merge "Add status bar flag to disable quick settings" into mnc-dev 2015-04-29 08:36:00 +00:00
Jeff Sharkey
572b107896 am 15c7f90c: am b42d6946: Method to wipe all adoptable disks.
* commit '15c7f90c8d84ce992659d0ec29bb0e60f1b603d1':
  Method to wipe all adoptable disks.
2015-04-29 05:52:35 +00:00
Jeff Sharkey
a149ba0255 am aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord.
* commit 'aa4e35eb6540806958cb37c5c564c5d20dd7a978':
  Split some VolumeInfo state into VolumeRecord.
2015-04-29 05:41:33 +00:00
Jeff Sharkey
b42d694691 Method to wipe all adoptable disks.
Will be used by various classes doing factory reset.

Bug: 9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
2015-04-28 22:25:26 -07:00
Jeff Sharkey
b36586a7c9 Split some VolumeInfo state into VolumeRecord.
VolumeRecord is a historical record of a volume that we've seen in
the past.  It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.

Show progress notifications for both storage and package movement
operations.  Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.

Add API to forget volumes.

Bug: 20275424, 20275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa
2015-04-28 22:02:36 -07:00
Shawn Willden
b672afaa8c am adbbba9f: Merge "Add missing error codes from keymaster_defs.h."
* commit 'adbbba9f1dc364e4d3911562fdb8f2e666922e2f':
  Add missing error codes from keymaster_defs.h.
2015-04-29 04:54:33 +00:00
Alan Viverette
9c36ee9b4f am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"
* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1':
  Context leaks in EditText causes out of memory
2015-04-29 04:54:28 +00:00
Shawn Willden
adbbba9f1d Merge "Add missing error codes from keymaster_defs.h." 2015-04-29 04:30:18 +00:00
Alan Viverette
2ddfcc4ade Merge "Context leaks in EditText causes out of memory" 2015-04-29 04:19:40 +00:00
Alex Klyubin
a65101cd49 am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit 'ecde03306541259d786aeac9a658f440a2e1b098':
  Align AndroidKeyStore API with user auth API.
2015-04-29 02:01:16 +00:00
Jeff Brown
4b5a7b718e am d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit 'd5a9ff0e7bec6d1e4b93fc8475ca18f5ec0256e1':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
2015-04-29 02:01:11 +00:00