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

47529 Commits

Author SHA1 Message Date
Dan Sandler
ec1f0145fb am a89899a3: am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev 
* commit 'a89899a3241008679cf1c37651ea8bf9adc65ecd':
  Icon: a clean, parcelable place for images.
 2015-05-01 18:30:58 +00:00
Doris Liu
9f8c17d2bb am b343db76: am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 
* commit 'b343db76aa8623a0253746f70beb5543c3ae5473':
  Make sure transform matrix is applied when hardware layer is re-created
 2015-05-01 18:30:48 +00:00
Dan Sandler
a89899a324 am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev 
* commit '548f4d6c7089dc262f47b18542566b0a72807ac6':
  Icon: a clean, parcelable place for images.
 2015-05-01 18:19:20 +00:00
Doris Liu
b343db76aa am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 
* commit '3ebbc50c3f2d3b8939e02fb22cef1dc1c2cc8a66':
  Make sure transform matrix is applied when hardware layer is re-created
 2015-05-01 18:19:10 +00:00
Dan Sandler
9fc943d1a6 Merge "Icon: a clean, parcelable place for images." into mnc-dev 2015-05-01 17:57:14 +00:00
Doris Liu
27cfed7ba5 Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev 2015-05-01 17:54:44 +00:00
Dan Sandler
b9f7aac348 Icon: a clean, parcelable place for images. 
Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470
 2015-05-01 13:44:42 -04:00
Jeff Sharkey
521f5612ff am 399199fe: am 3b342179: am a320505f: Merge "Move both app code and data together." into mnc-dev 
* commit '399199fe8239c11f902265b03f90dc8194e59a53':
  Move both app code and data together.
 2015-05-01 16:58:14 +00:00
Jeff Sharkey
399199fe82 am 3b342179: am a320505f: Merge "Move both app code and data together." into mnc-dev 
* commit '3b3421796f154e846797a534cae25e97478d35bc':
  Move both app code and data together.
 2015-05-01 16:45:49 +00: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
1742c743c9 am 1ad0936c: am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev 
* commit '1ad0936c77d3c742970e7051c62c715a00c082ca':
  A bunch more cleanups
 2015-05-01 15:12:22 +00:00
John Reck
1ad0936c77 am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev 
* commit '7e22cc9965b440a7f34b18cbbec1818f7b7ac68e':
  A bunch more cleanups
 2015-05-01 15:00:38 +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
Narayan Kamath
7953b958f4 am c2b1f93c: am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M 
* commit 'c2b1f93c70cadfed69b8ad9114de7c8cfcaef3e2':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
 2015-05-01 11:26:47 +00:00
Narayan Kamath
c2b1f93c70 am 2d7d9523: am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M 
* commit '2d7d952323a11e0fcf8b2d435ba857d45af05503':
  AlarmManager: Reject non-olson timezones for targetSdk >= M
 2015-05-01 11:15:54 +00:00
Narayan Kamath
a78240ba5f AlarmManager: Reject non-olson timezones for targetSdk >= M 
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).

bug: 19987403
bug: 19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
 2015-05-01 09:39:25 +00:00
Wei Wang
3af0a8e48d am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit '17004d636712c092d7ac8fdfcf933572481cebfb':
  Fix a bug in ScanSettings constructor.
 2015-05-01 09:19:54 +00:00
Wei Wang
17004d6367 am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit '342c22a5973386d5a5fdb0b552a26f51920cb026':
  Fix a bug in ScanSettings constructor.
 2015-05-01 08:48:14 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor. 
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
 2015-05-01 00:50:32 -07: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
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
Lorenzo Colitti
0c12125e00 am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 04:19:07 +00:00
Lorenzo Colitti
ad44d81457 am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit '3dc082200a1f425ab579e2082c0d70eefa399b8b':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 04:04:03 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 03:45:14 +00:00
Lorenzo Colitti
f7058f5d1d Add a hidden method to clear NetworkCapabilities. 
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
 2015-05-01 12:36:29 +09:00
Lorenzo Colitti
2ea89e59c3 Fix javadoc error for requestNetwork. 
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.

Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922
 2015-05-01 12:36:29 +09:00
Lorenzo Colitti
db95a60981 Simplify network callback handling code. 
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
 2015-05-01 12:36:28 +09:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK. 
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
 2015-05-01 12:36:28 +09:00
tturney
5d818eb675 am 129a0b8b: am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev 
* commit '129a0b8bf9a0e531792ac576d217fbc6e0de96c6':
  Fix typo. bug: b/20610710
 2015-05-01 01:35:02 +00:00
Alan Viverette
ec48536d30 am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 
* commit '4cff05e1f7ec780f1ab0b77202453867eaf146f3':
  LayoutInflater should always try to generate LayoutParams for include
 2015-05-01 01:33:00 +00:00
Alex Klyubin
0219269280 am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'c89e1a96c5e4cc16928341f30a45e315d1a4abb6':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-05-01 01:32:53 +00:00
Alex Klyubin
ab5ed9d2b6 am c9122d6f: am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit 'c9122d6fe29411eb02e91c7713a450aba94b65e3':
  Fix thread affinity of FingerprintManager.
 2015-05-01 01:32:41 +00:00
Todd Kennedy
6b379c8a34 am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit '9c14b3ab0d6e42031d0465114a979b644c6890d2':
  Remove dependency upon FragmentActivity
 2015-05-01 01:32:25 +00:00
Mady Mellor
304169fdd0 Merge "resolved conflicts for merge of 04f2fe39 to master" 2015-05-01 01:28:46 +00:00
tturney
129a0b8bf9 am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev 
* commit '94d7494a2b98b723710eee9d3398e99e64b7688b':
  Fix typo. bug: b/20610710
 2015-05-01 00:50:00 +00:00
tturney
56c58a2e27 Merge "Fix typo. bug: b/20610710" into mnc-dev 2015-05-01 00:17:41 +00:00
Doris Liu
6b471995cb Make sure transform matrix is applied when hardware layer is re-created 
Bug: 11168275
Change-Id: I9234a2efc7580d27ac8b7f0e60ceed7df23f5f25
 2015-04-30 17:16:46 -07: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
Zheng Fu
096a75eb77 Merge "Add constants for ContactMetadataProvider." 2015-04-30 21:23:13 +00:00
Alan Viverette
4cff05e1f7 am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 
* commit '877063589ac8b5d9e8151df9b8553ddd3adb752b':
  LayoutInflater should always try to generate LayoutParams for include
 2015-04-30 21:21:01 +00:00
Alex Klyubin
c89e1a96c5 am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 
* commit 'c8b068ce477b3520a1ab20b7f29455d630724c38':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
 2015-04-30 21:20:56 +00:00
Alex Klyubin
c9122d6fe2 am 07a2ebd3: am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev 
* commit '07a2ebd39d4c77c2dbd3c6e2bddecf76894f9fba':
  Fix thread affinity of FingerprintManager.
 2015-04-30 21:20:47 +00:00