drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,587 Commits 1 Branch 0 Tags
Commit Graph

26332 Commits

Author SHA1 Message Date
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Jeff Sharkey
a320505f3a Merge "Move both app code and data together." into mnc-dev 2015-05-01 16:22:46 +00:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
Robin Lee
7c298065fb am 4ee45178: am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev 
* commit '4ee45178c8fee24874368b4f67ceb24d62a7baff':
  Device policy: use owner label instead of name
 2015-05-01 13:30:01 +00:00
Robin Lee
4ee45178c8 am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev 
* commit 'dbb03371cea085f06de3e9cfb255efaad9a97d4e':
  Device policy: use owner label instead of name
 2015-05-01 13:20:13 +00:00
Robin Lee
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +00:00
Wei Wang
3b72899c71 am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit 'c869bbfd94549039624f76740f9bf858b25cfa56':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:41:17 +00:00
Wei Wang
c869bbfd94 am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit '50b37f8c6a7237af29f533b83ee2176301d107ea':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:30:36 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master 
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
 2015-04-30 16:17:16 -07:00
Jeff Sharkey
bd0e9e4958 Move both app code and data together. 
Refactor app movement code into the normal install flow as a new
flavor of InstallArgs.  It copies both app code and data during the
copy step, and just updates paths during the rename step.

Measure free space before kicking off a move.  Spawn a thread to
derive a hacky progress estimate based on free disk space counting
down.

Remove checkFreeStorage() and getLegacyNativeLibraryPath() which
nobody was calling.  Fix deadlocks around package broadcasts, and fix
wrong lock ordering when loading packages.

Bug: 19993667, 20275578, 20370140
Change-Id: I7bbf14c924a724d6ebb8a41a02434750fa3302bc
 2015-04-30 16:04:53 -07:00
Wei Wang
67d8416b8e Honor Ble scanning settings from Settings UI. 
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
 2015-04-30 14:45:17 -07:00
John Reck
3731dc220e A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-30 14:34:55 -07:00
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
Bryce Lee
f626c679fd am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'a7f07fc35ba647465503fe0cba3d4521b68d89c1':
  Add configuration to allow animations during low power mode.
 2015-04-30 20:01:02 +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
e80045ac64 am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev 
* commit 'cae8686c8853de745baf8a26406d18efab09a380':
  Add use fingerprint app op - framework
 2015-04-30 18:58:30 +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
Kenny Guy
4c5067ea8e Call profile changed in cases were focused activity is nulled. 
Fix case where profile changed listener isn't called as
focused acitivity is set to null due to app crash.

Bug: 20254760
Change-Id: Ifc296682b9f7cb85c05137e8ad6ad74d31bf6eff
 2015-04-30 19:39:00 +01:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Robin Lee
ddd553f2ae Device policy: use owner label instead of name 
Managed provisioning does not currently set a meaningful profile owner
name. This changes to use the application label as returned by
PackageManager.getApplicationLabel which should be more descriptive.

Bug: 20679292
Change-Id: I5a0e87ef05b62879a73814e6d338e8b984b81c94
 2015-04-30 18:01:46 +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
e36846cbf1 am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit 'c8efc4490df6fb58bf333540cf746c68070345f5':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:26:29 +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
b7ca2709c3 am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
  Zen: New event condition data model.
 2015-04-30 16:25: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
e5f6407994 am 2aab6de5: am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 
* commit '2aab6de5a8370833077c3d58a64e615c33e52e0f':
  Fix potential NPE on devices without DPMS
 2015-04-30 15:35:11 +00:00
Benjamin Franz
c5e3d4361d am f225e6c6: am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit 'f225e6c6af849f965eec8392204b2491f17babac':
  Add package name extra to PackageInstaller callback
 2015-04-30 15:35:05 +00:00
Jeff Sharkey
bc493cabf5 am a54020c7: am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev 
* commit 'a54020c7ae1c7a28ea78f0fe44ad5da662a0bb1e':
  New "frozen" state during app move/upgrade.
 2015-04-30 15:34:41 +00: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
b1ce9b9cf9 am df7f02b6: am ad61b833: Merge "Fix no vibration during shutdown." 
* commit 'df7f02b6e098dbcda6a6d52252c31ee2e02d8e00':
  Fix no vibration during shutdown.
 2015-04-30 12:56:53 +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
Jinsuk Kim
7cc51c631d CEC: Reset active source/path before going into standby 
Bug: 20681302
Change-Id: I2e6d460f9ec06d1ef988b7a7ff73a03586958484
 2015-04-30 02:33:03 +00:00
Bryce Lee
023de22cf2 Add configuration to allow animations during low power mode. 
On Android Wear, the stream ui needs to continue to be animated during
low power mode.

Bug: 20696607
Change-Id: I24a87eba8d86169d04a72012e0311357622db00a
 2015-04-29 18:34:44 -07:00
Jeff Sharkey
15cbbd5e4b am 21a30889: am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev 
* commit '21a30889485020bf885ca20e209ed85c6e7d4ea5':
  Returning to wizard, split move events.
 2015-04-30 01:21:08 +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