Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,496 Commits 3 Branches 0 Tags
bc4affc982c508da58c934d5d30f393dfd701a9a
Commit Graph

51463 Commits

Author SHA1 Message Date
Svetoslav
bc4affc982 am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev 
* commit '9e4003cde7dc33342042328923999ec545a8bfbf':
  Add process outgoing calls app op - framework
 2015-04-30 18:29:58 +00:00
Svetoslav
ccd368087e am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev 
* commit '71264fb236b50de815a328d9ecab29535d1ecb17':
  Add SIP app op - framework.
 2015-04-30 18:29:49 +00:00
Svetoslav
729d0a06ea Merge "Add process outgoing calls app op - framework" into mnc-dev 2015-04-30 18:02:55 +00:00
Svetoslav
c27b3fca82 Merge "Add SIP app op - framework." into mnc-dev 2015-04-30 18:01:51 +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
Alex Klyubin
588fffc23e am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 
* commit '84c64efef90818888dca12f7650a632b70438a8f':
  AndroidKeyStore keys should not be handled by Bouncy Castle.
 2015-04-30 16:39:11 +00:00
Alan Viverette
68999a740c am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev 
* commit '19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
 2015-04-30 16:21:57 +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
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +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
Wei Wang
fb63b6820d am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev 
* commit '46fa9a964f5897d8f125f5ad2e25080043810233':
  Temp workaround to track max beacons.
 2015-04-30 15:20:05 +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
Narayan Kamath
b0f3d9ea6e Fix incorrect javadoc for Uri.getQueryParameter. 
This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651

(cherry picked from commit 4356c95354)

Change-Id: I5b96bcb20aa3a1d227dd5b00926af077276fc666
 2015-04-30 12:23:19 +01:00
Wei Wang
05a419aed5 Merge "Temp workaround to track max beacons." into mnc-dev 2015-04-30 07:08:43 +00:00
Wei Wang
fc9f2d71a6 Temp workaround to track max beacons. 
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
 2015-04-30 00:07:53 -07:00
Shawn Willden
7230bdf23b Merge "Add missing error codes from keymaster_defs.h." into mnc-dev 2015-04-30 05:14:51 +00:00
Shawn Willden
dbc00eb0aa Add missing error codes from keymaster_defs.h. 
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
 2015-04-29 23:13:20 -06:00
Jeff Sharkey
21df222fa8 Merge "New "frozen" state during app move/upgrade." into mnc-dev 2015-04-30 05:09:02 +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
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
b4004dfc84 ActionBar SearchView's default hint shouldn't override SearchableInfo 
Moves the queryHint to defaultQueryHint, specifies the override order
as queryHint > SearchableInfo > defaultQueryHint.

Cleans up annotations and comments for several related methods.

Bug: 20614122
Change-Id: Ib58ec309e6814cd512df147d789ec0cd546018af
 2015-04-29 16:55:42 -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
Svetoslav
c656e6fba6 Add process outgoing calls app op - framework 
Change-Id: If662b47372a1ddb6ff60ccdbd910192577abc924
 2015-04-29 15:43:38 -07:00
Svetoslav
5335b6793c Add SIP app op - framework. 
Change-Id: Iac552a12e0ed5d1cf585179430c468d8603b6c01
 2015-04-29 15:43:38 -07: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