Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,791 Commits 3 Branches 0 Tags
c8ea30e87f782a0ac4a07ee289ecc811fa07ae39
Commit Graph

4635 Commits

Author SHA1 Message Date
David Christie
4ec0cf048a am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit '1fc17b58efa68b7128fd5b1cfa3355c353aaff4e':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:29:00 +00:00
Adam Lesinski
9af8dc1e2a am f0e1995c: am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit 'f0e1995c81ffc925ae630987df26641330df4a38':
  Add Configuration changes to UsageStats
 2014-09-04 21:18:22 +00:00
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore. 
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 20:53:21 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jason Monk
7a0e79850f am de6e56d8: am 2b9a1d51: am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit 'de6e56d8fda86cc0e7712e49dab370d21a3addb3':
  Change constants from API review feedback
 2014-09-04 20:11:54 +00:00
Kenny Guy
d946dfa6b0 am c9e9b3bf: am 68fc49ee: am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit 'c9e9b3bfc3569260d708270aee9c49380cfb7366':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:51:13 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07:00
Kenny Guy
6e0a5aef30 Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 2014-09-04 19:14:25 +00:00
Jason Monk
5503a55c0b Change constants from API review feedback 
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
 2014-09-04 14:25:45 -04:00
George Mount
d1b0dea1d6 am 70871f3d: am 9169d544: am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit '70871f3d6f1e01197f7bce0490f2f188d619156c':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:24:47 +00:00
Chris Wren
5f7a272e89 am 8bfe191a: am 4b6f4321: am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit '8bfe191a93103523d57229f3d07b3a7bdb219852':
  Honor per-app sensitivity setting.
 2014-09-04 18:10:06 +00:00
George Mount
0f6c32af06 Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 2014-09-04 18:03:52 +00:00
George Mount
9e18397112 "Back" with translucent window now sets ActivityOptions. 
Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
 2014-09-04 11:02:29 -07:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
Kenny Guy
692356b7c3 Revert "Ensure all RemoteViews use myUserId rather than context." 
This reverts commit 5287e37687f117ac0b690100ad90842eff58d15a.
Reverting because only worked if settings cache had been populated
already.

Bug: 17302505
Change-Id: I4360606e9d9c6409951f0a02bd0b78c55085e0c6
 2014-09-04 18:24:31 +01:00
Alexandra Gherghina
cf1d060664 am 88362b9b: am aa41f76f: am 3d23ae9f: Merge "Fix NPE from empty PackageInfo" into lmp-dev 
* commit '88362b9bac9762d5cd60b8d04652eccaa32ef573':
  Fix NPE from empty PackageInfo
 2014-09-04 16:05:29 +00:00
Chris Wren
3ad4e3a45b Honor per-app sensitivity setting. 
Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.

Bug: 16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
 2014-09-04 11:49:06 -04:00
Alexandra Gherghina
0cd0b186c3 Merge "Fix NPE from empty PackageInfo" into lmp-dev 2014-09-04 15:33:50 +00:00
Alexandra Gherghina
db811dbc70 Fix NPE from empty PackageInfo 
Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
 2014-09-04 15:46:23 +01:00
Dan Sandler
af038f69ff am 6e01c30b: am 5832bf2a: am 195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev 
* commit '6e01c30bfec0c8e4a5dce0ff318b32a91b2ab7e7':
  Notification: Limit length of accepted strings
 2014-09-04 14:08:00 +00:00
Kenny Guy
3f9c59cea1 am aa0ffe26: am 0d548a70: am 5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 
* commit 'aa0ffe267c3bbdefb548cb5de6c7bda29f5365cb':
  Ensure all RemoteViews use myUserId rather than context.
 2014-09-04 13:40:58 +00:00
Dan Sandler
d2961355bd Merge "Notification: Limit length of accepted strings" into lmp-dev 2014-09-04 13:36:34 +00:00
Kenny Guy
a449018105 Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 2014-09-04 13:09:32 +00:00
Sander Alewijnse
b44b5d2fa9 am 32cbce43: am 085baf07: am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev 
* commit '32cbce437fbd3f9ed94275b630a98bda970b7b08':
  Rename email extra to email bundle key.
 2014-09-04 12:26:03 +00:00
Kenny Guy
879ebec4e2 Ensure all RemoteViews use myUserId rather than context. 
Remote views may be inflated in another user so
explicitly use processes user id rather than the
user id of the context.

Bug: 17302505
Change-Id: I985c91745f03dd7e6b2ab6357600077664d8e6be
 2014-09-04 12:40:24 +01:00
Sander Alewijnse
aff9f4cb88 Rename email extra to email bundle key. 
Bug:17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
 2014-09-04 12:28:52 +01:00
Dan Sandler
2e7fb6d92a am 5069f587: am c0a4823d: am cdb9de6a: Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 
* commit '5069f58767329b20695564c093900773d555416b':
  Reduce RAM requirements of grayscale icon testing
 2014-09-04 00:01:31 +00:00
Eino-Ville Talvala
751e932d93 am 1b16ae37: am 5bb3b70b: am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev 
* commit '1b16ae372561674c1eabdf6ff5d1014e3551a91d':
  JobScheduler: Fix doc build break
 2014-09-04 00:00:51 +00:00
Amith Yamasani
3a3bea2825 am 9a1850be: am 7202fd15: am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 
* commit '9a1850be6f21b47d9d8f4fad2187a360ede59de5':
  Add some @SystemApi tags for internal user-related APIs
 2014-09-04 00:00:30 +00:00
Dan Sandler
d1dc910eff Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 2014-09-03 22:15:38 +00:00
Dan Sandler
05c362d564 Reduce RAM requirements of grayscale icon testing 
The isGrayscale family of methods is designed to identify
drawables and bitmaps that apps are using in the largeIcon
position to pose as small icons in order to get the
appropriate background treatment (a solid blue or gray block
in KK/JB, or geniune selvedge denim in ICS/HC).

We can optimize this search two ways:

(1) Reject immediately any largeIcon that is larger than
    largeIcons should be (64x64dp). We could one day simply
    reject, or resize, these in the notification manager,
    but regardless these are not plausible smallIcon
    subsitutes. This new constraint is commemorated in the
    new name, isGrayscaleIcon().

(2) Shrink the bitmap even smaller before scanning it slowly
    in Java.  This lets native_drawBitmap do the heavy
    lifting across the entire bitmap; we need only scan a
    few pixels.

Bug: 16513124
Change-Id: I3a2b79130ed2465a4aedfbb5a556db7f8a7aa132
 2014-09-03 23:52:47 +02:00
Eino-Ville Talvala
93b47603bf JobScheduler: Fix doc build break 
Change-Id: I769da7274fe5e3f64a47c82f893afeee6a11254e
 2014-09-03 20:51:13 +00:00
Amith Yamasani
bef1036af7 Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 2014-09-03 20:26:10 +00:00
Amith Yamasani
0e8d7d63ba Add some @SystemApi tags for internal user-related APIs 
Also added an internal isManagedProfile()

Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
 2014-09-03 13:17:28 -07:00
Matthew Williams
f79808b110 am 2f58db1c: am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '2f58db1cd33065c9170d8036554eba9ca79b2589':
  Add timeout when waiting to bind to JobService
 2014-09-03 19:25:10 +00:00
George Mount
cd93a304b6 am d2c53b71: am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'd2c53b71cf41db9c443bfeec3e595c1fc4058ef8':
  Additional fixes for "back" with translucent windows.
 2014-09-03 19:24:10 +00:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master 
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
 2014-09-03 19:57:35 +01:00
Dake Gu
103fc6da2a am a9d6e6e3: am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a9d6e6e3088e36ba731a801e676045bf65e557a8':
  ActivityTransition: fix activity not finished on back
 2014-09-03 18:04:32 +00:00
Brian Carlstrom
9844fdbd9e am 4421aaf7: am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '4421aaf7558be72d83d453817f93741f267d5516':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:55:29 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
George Mount
613a5f8805 am 3f1f97f9: am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '3f1f97f9cff3ffa28ad00bbeeada7ec70ae5c6bd':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:42:12 +00:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows. 
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
 2014-09-03 17:29:57 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Brian Carlstrom
f1fe51b914 Fix DevicePolicyManager javadoc 
Bug: 17126717
Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
 2014-09-03 09:00:06 -07:00
Christoph Studer
eaae6de994 am a8c199d8: am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit 'a8c199d8fa51d431d047be231a650e8142239ee1':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 15:35:54 +00:00