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

203077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
b96d1f1e69 am 242c1f33: am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '242c1f333431b32445336faed18feb1a90ebd6e4':
  Remove not needed contacts related permissions.
 2015-06-23 23:42:34 +00:00
Svetoslav Ganov
242c1f3334 am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '4475dbcacba57702f0bc1d3e5722f3cac97bdb6a':
  Remove not needed contacts related permissions.
 2015-06-23 23:30:33 +00:00
Svetoslav Ganov
4475dbcacb am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '2c99ea3524bba58f87a9fefad79aa136538b6e0e':
  Remove not needed contacts related permissions.
 2015-06-23 23:19:49 +00:00
Zach Johnson
8fea419415 am 627c5e0a: am 9a8f0138: am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '627c5e0a9234a0e94170590cfd6ee558fec4c394':
  Update CarrierService long lived binding API
 2015-06-23 23:18:07 +00:00
Alan Viverette
99f5617ee5 am eea6c465: am c7201180: am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev 
* commit 'eea6c46550cb3f56b75eefebbda4c7f09bbf0cdd':
  Remove isDither(), deprecate setDither()
 2015-06-23 23:17:54 +00:00
Todd Kennedy
54b6b3c82b am 97ea7af9: am 126b5875: am c6040826: Merge "Skip upgrade keys for adopted storage" into mnc-dev 
* commit '97ea7af996c5209c9e2ec594b24df71aa1e47415':
  Skip upgrade keys for adopted storage
 2015-06-23 23:10:35 +00:00
Todd Kennedy
fd18070045 am 7f3edf22: am b6384b55: am c0039894: Merge "Handle volume benchmark timeout" into mnc-dev 
* commit '7f3edf228bbc90f02554e158c381541090006514':
  Handle volume benchmark timeout
 2015-06-23 23:10:29 +00:00
Adam Lesinski
caef842f35 am c62dafdf: am 05feded4: am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 
* commit 'c62dafdffc5a382b47d47d5aad528d8500eafb3b':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS
 2015-06-23 23:10:22 +00:00
Jae Seo
7f70dab11c am c31b03db: am b497945f: am 1d462aa6: Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 
* commit 'c31b03dba7bb2b84932002fa3e118cd3fd84a5fc':
  TIF: Always invalidate the session callback when resetting TvView
 2015-06-23 23:10:16 +00:00
Bill Yi
a576d8d4d3 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-06-23 23:10:14 +00:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions. 
This reverts commit ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
 2015-06-23 23:03:55 +00:00
Xiaohui Chen
b1cc316dce Merge "Introduce system user and primary user." 2015-06-23 22:44:03 +00:00
Zach Johnson
627c5e0a92 am 9a8f0138: am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '9a8f0138c5d25cabb5386234363bc2a0be9878ca':
  Update CarrierService long lived binding API
 2015-06-23 22:43:36 +00:00
Alan Viverette
eea6c46550 am c7201180: am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev 
* commit 'c7201180d1f4e5eb9e990f0a7ad618cfcc58e9e4':
  Remove isDither(), deprecate setDither()
 2015-06-23 22:33:09 +00:00
Zach Johnson
9a8f0138c5 am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '12402dafeaf2ec8255d6331d3e82028d694b87d7':
  Update CarrierService long lived binding API
 2015-06-23 22:30:09 +00:00
Xiaohui Chen
70f6c38644 Introduce system user and primary user. 
Bug: 19913735
Change-Id: I2c7855915d778cf80a7154314321ddd90e2eaaac
 2015-06-23 15:25:37 -07:00
Adam Lesinski
b77912e07d am 9d05553b: am ce5bcf8b: am ad5f292b: Merge "Extend the time between WiFi energy samples" into mnc-dev 
* commit '9d05553b07fe2ba3534e5f39372165c6f48b99a4':
  Extend the time between WiFi energy samples
 2015-06-23 22:21:51 +00:00
oleksii stepanian
c6486e08fd am 08502957: am 3285efc0: am e6953913: Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 
* commit '08502957b8bb9743f618a7b65a901c552b44061f':
  Send installerUid for verification when using PackageInstaller.
 2015-06-23 22:21:10 +00:00
Zach Johnson
12402dafea Merge "Update CarrierService long lived binding API" into mnc-dev 2015-06-23 22:19:25 +00:00
Alan Viverette
c7201180d1 am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev 
* commit '9137fcaa92e70f7ade386f2905d55b22a1362add':
  Remove isDither(), deprecate setDither()
 2015-06-23 22:17:05 +00:00
Jeff Davidson
43469fd4a4 resolved conflicts for merge of 8685db85 to master 
Change-Id: I8fbf397082ac90d6a173785538fd6eeb8e4976f7
 2015-06-23 15:11:37 -07:00
Alan Viverette
9137fcaa92 Merge "Remove isDither(), deprecate setDither()" into mnc-dev 2015-06-23 22:06:15 +00:00
Todd Kennedy
97ea7af996 am 126b5875: am c6040826: Merge "Skip upgrade keys for adopted storage" into mnc-dev 
* commit '126b5875318dc04091a2b8e4dff82ee516a18a3c':
  Skip upgrade keys for adopted storage
 2015-06-23 21:55:52 +00:00
Todd Kennedy
7f3edf228b am b6384b55: am c0039894: Merge "Handle volume benchmark timeout" into mnc-dev 
* commit 'b6384b55235abc81c7a2df735193c3f1be0fd03c':
  Handle volume benchmark timeout
 2015-06-23 21:55:42 +00:00
Adam Lesinski
c62dafdffc am 05feded4: am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 
* commit '05feded4f153707eadefe04f727be962b3e87778':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS
 2015-06-23 21:55:38 +00:00
Jae Seo
c31b03dba7 am b497945f: am 1d462aa6: Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 
* commit 'b497945f12f6b3af9a0020cf87aa6cadef390bf7':
  TIF: Always invalidate the session callback when resetting TvView
 2015-06-23 21:55:32 +00:00
Todd Kennedy
126b587531 am c6040826: Merge "Skip upgrade keys for adopted storage" into mnc-dev 
* commit 'c60408264c7fe19d2f1f3550556f7e6bc1ca716d':
  Skip upgrade keys for adopted storage
 2015-06-23 21:49:43 +00:00
Todd Kennedy
b6384b5523 am c0039894: Merge "Handle volume benchmark timeout" into mnc-dev 
* commit 'c00398948811690728ed4909f87d01c24a8a0938':
  Handle volume benchmark timeout
 2015-06-23 21:49:39 +00:00
Adam Lesinski
05feded4f1 am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 
* commit '8144aa2e9a732be6ba66c385a590e07ec59c5f77':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS
 2015-06-23 21:43:07 +00:00
Jae Seo
b497945f12 am 1d462aa6: Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 
* commit '1d462aa6f89b8b0d4c467c4f3244215b01c0baa8':
  TIF: Always invalidate the session callback when resetting TvView
 2015-06-23 21:43:02 +00:00
Todd Kennedy
c60408264c Merge "Skip upgrade keys for adopted storage" into mnc-dev 2015-06-23 21:42:06 +00:00
Todd Kennedy
c003989488 Merge "Handle volume benchmark timeout" into mnc-dev 2015-06-23 21:41:20 +00:00
Todd Kennedy
8101ee6884 Handle volume benchmark timeout 
If a volume benchmark operation times out, we don't want to show
a cryptic toast message. Instead, we return a very large integer
[eg Long.MAX_INT]. The storage wizard can then use this value
to show an appropriate dialog if it chooses.

Bug: 21376364
Change-Id: I3d97336e19c93511cfff2cbdb2f07ab033a1143d
 2015-06-23 14:40:32 -07:00
Adam Lesinski
8144aa2e9a Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 2015-06-23 21:37:20 +00:00
Adam Lesinski
9d05553b07 am ce5bcf8b: am ad5f292b: Merge "Extend the time between WiFi energy samples" into mnc-dev 
* commit 'ce5bcf8b896e7428eb6ae5b7dcd296d4b690c6d2':
  Extend the time between WiFi energy samples
 2015-06-23 21:35:05 +00:00
Alex Klyubin
b9630d4386 am 22d5ae5b: am 168af812: am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '22d5ae5bab2585cf2c8f78bc516ac950ecebaf48':
  Keymaster key validity dates are optional.
 2015-06-23 21:31:37 +00:00
Chris Wren
0f1f6e1c9d am fcdbafc1: am 95470bf0: am f1b25bd4: fix the build: remove duplicated line 
* commit 'fcdbafc14952989a94ab54f73650b22629d0a66c':
  fix the build: remove duplicated line
 2015-06-23 21:31:32 +00:00
Jae Seo
9bd84f0810 am 1f765d22: am 7a91fd62: am ac2c8908: Merge "TIF: Add more description to the poster art and thumbnail columns" into mnc-dev 
* commit '1f765d22302bb10917b6329aeeb9d2a3b36cb4f5':
  TIF: Add more description to the poster art and thumbnail columns
 2015-06-23 21:31:26 +00:00
Chris Wren
f6f90b6113 am 30dc121f: am a049cf92: am 72e7230b: Merge "collect more stats about the notification API" into mnc-dev 
* commit '30dc121f7ef4892073bc0b91a4018efd34e9f9a3':
  collect more stats about the notification API
 2015-06-23 21:31:21 +00:00
Jason Monk
7b9a1b45b6 am fd183561: am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit 'fd183561e0f5d6fa2df8d13eda34cfc11f931ae3':
  Add metrics to brightness slider
 2015-06-23 21:31:16 +00:00
Zach Johnson
08a244cee8 Update CarrierService long lived binding API 
Should take a metadata approach instead of a separate
intent.

b/21080696

Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
 2015-06-23 14:31:13 -07:00
Ruben Brunk
5d4c5a1808 am ee3fe5d2: am 282d78a9: am 323b768d: Merge "Ensure camera service is notified of user profile changes." into mnc-dev 
* commit 'ee3fe5d22aa1a946462d5c15d5c8a5b95fb6ad36':
  Ensure camera service is notified of user profile changes.
 2015-06-23 21:31:11 +00:00
Amith Yamasani
1d69d48596 am ab8d7e31: am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'ab8d7e31fb1b6526479844111b177be81a54a31c':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:31:05 +00:00
Paul Jensen
45895c802b am 0a99ca6e: am daf6b73b: am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 
* commit '0a99ca6e3c15983e91273fbc1c109f84f25ea982':
  Disallow requesting networks with mutable NetworkCapabilities.
 2015-06-23 21:31:00 +00:00
Paul Jensen
f10fca0e3d am 79437726: am afb94be6: am 28dd8c4a: Merge "Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes" into mnc-dev 
* commit '794377266121cafc365b8d284b06e03c593feeae':
  Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes
 2015-06-23 21:30:54 +00:00
Paul Jensen
da65bb8678 am d61c4289: am 6716e3db: am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 
* commit 'd61c4289c964e78ec166d485cddbed06841ad33c':
  Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
 2015-06-23 21:30:47 +00:00
Alan Viverette
81e7dbddf1 Remove isDither(), deprecate setDither() 
Bug: 22013358
Change-Id: I37b11a94edc431a88522c6c056b76b045daa61d6
 2015-06-23 14:30:40 -07:00
Dianne Hackborn
2d021f8abf am 3eb5480b: am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '3eb5480b3464e7a29c0940a07cb094d24bc923f7':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:30:40 +00:00
Maxim Bogatov
af87c70547 am d6bdd65a: am 9d919a23: am e5a4a91c: Merge "Transfer a11y node with a11y event" into mnc-dev 
* commit 'd6bdd65aa47457740cbaeba162c864e48c14f83d':
  Transfer a11y node with a11y event
 2015-06-23 21:30:33 +00:00