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

153296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
2f25ab5b52 am 44542c46: Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev 
* commit '44542c4672eb2dc8626beace99dda809f73ba2ae':
  Improve subpixel rendering of battery icon on all densities
 2014-09-03 15:34:28 +00:00
Selim Cinek
5d035c145b am 6dbb3ec5: Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev 
* commit '6dbb3ec5d1d7e88e86739ff9068f9106b4663389':
  Correctly forwarding the screen off event on lockscreen
 2014-09-03 15:34:23 +00:00
George Mount
8021261c89 am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '12b7c53c52c450a0717749ca464805ddfa4277f3':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 15:34:23 +00:00
Santos Cordon
f4094e51c9 am 708a680e: Merge "Fix NPE in onDestroy." into lmp-dev 
* commit '708a680e630c452ff701203da69d69d8e674d4f1':
  Fix NPE in onDestroy.
 2014-09-03 15:34:19 +00:00
Selim Cinek
cab4a60c48 Fixed a bug where notification icons where not animating 
Bug: 16043845
Change-Id: I23217d90803fd247f6d1b4d2aea056deb5749c15
 2014-09-03 17:32:27 +02:00
Chet Haase
95f3bcdce0 Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 2014-09-03 15:19:29 +00:00
Winson Chung
67b4b2cdb4 Merge "Fixing Recents crash with non-primary user. (Bug 17343688)" into lmp-dev 2014-09-03 15:07:34 +00:00
Jason Monk
464775b39d am 1ab4a05d: am 46295dc1: Merge "Don\'t show add user for simple user switcher" into lmp-dev 
* commit '1ab4a05d305588854bfe93a1757c60459eb20b11':
  Don't show add user for simple user switcher
 2014-09-03 14:57:02 +00:00
Jason Monk
0b79b9a4d1 am e0676b50: am 9df55f5e: Merge "Correct hotspot notification asset" into lmp-dev 
* commit 'e0676b50c516b8fa9b501224a052dfeaf2bffe39':
  Correct hotspot notification asset
 2014-09-03 14:56:55 +00:00
Jason Monk
c55d9bb774 am f179010b: am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 
* commit 'f179010b8bedd9c018d0ba6991db9331efaa4153':
  Enforce permissions on start/stopLockTaskModeOnCurrent
 2014-09-03 14:56:50 +00:00
Jorim Jaggi
4eba7aa211 am f44e6d17: am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit 'f44e6d1768b7aa2f173658f8979c35870d256621':
  Status bar iconography updates
 2014-09-03 14:56:45 +00:00
Christoph Studer
8f4b3a9119 am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '5df1917f8349b842812a5af430862d167a5b0ed6':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 14:56:39 +00:00
Chet Haase
90ab047540 Merge "Fix behavior of inflating InsetDrawable" into lmp-dev 2014-09-03 14:55:30 +00:00
Chet Haase
5a7cf3eeeb Fix TransitionManager.go() to allow null transitions 
The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
 2014-09-03 07:53:15 -07:00
Jorim Jaggi
66a75e5e91 Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev 2014-09-03 14:50:31 +00:00
Selim Cinek
f6478d4c0a Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev 2014-09-03 14:49:22 +00:00
Santos Cordon
7632a807f7 Merge "Fix NPE in onDestroy." into lmp-dev 2014-09-03 14:48:37 +00:00
Adrian Roos
be47b07bef Auto dismiss lockscreen when switching to guest 
Bug: 16659674
Change-Id: I8d24a3997ac7493cd8a8317f8a35532eaf5c3cfe
 2014-09-03 16:46:55 +02:00
Jorim Jaggi
a0221f3a9f Improve subpixel rendering of battery icon on all densities 
Bug: 16161255
Change-Id: I97abc6a7a5cafb581e3f7c3d7509fdbf6d8542d5
 2014-09-03 16:37:06 +02:00
Sander Alewijnse
75dd22c135 am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'a0e6069c54b3e505199df50108bf0a38bee17170':
  Add the provisioning extra admin extras bundle.
 2014-09-03 14:35:45 +00:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
 2014-09-03 14:35:32 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 14:34:47 +00:00
Dianne Hackborn
d52184d170 am 3364a9f9: am d136d986: Add more slow execution logs. 
* commit '3364a9f92e7acbf3cc43c036d51056ac51e4226e':
  Add more slow execution logs.
 2014-09-03 14:34:10 +00:00
Dianne Hackborn
49aa4b60e0 am fd4fcdb7: am 8b88d87e: Merge "Revert "And yet more logging for slow execution."" into lmp-dev 
* commit 'fd4fcdb7e1b6579559cb15db4204ac704c2c7773':
  Revert "And yet more logging for slow execution."
 2014-09-03 14:34:05 +00:00
Alan Viverette
f832d268e3 am 8ebb56ee: am 37e5b8e4: Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 
* commit '8ebb56ee53629e2acafe28f08c3869f911dc8e18':
  Use null instead of transparent for Material alert dialog sections
 2014-09-03 14:33:46 +00:00
Vinit Deshpande
f0f4058c6a am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit 'f4b970e5fc0204334ff3990ccb47f6323fd68ee7':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 14:33:41 +00:00
Youngsang Cho
dc6aa76193 am 797b2b0d: Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 
* commit '797b2b0de4246fabf9680babde907bd864cd639c':
  Add a warning log when it takes long time to handle a message in TIS
 2014-09-03 14:32:23 +00:00
George Mount
ae59476fa6 am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 14:32:18 +00:00
Youngsang Cho
6e31e0f3d1 Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 2014-09-03 14:24:39 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Youngsang Cho
9df2c1be32 Add a warning log when it takes long time to handle a message in TIS 
Bug: 17291092
Change-Id: If14ff467ac81d4f8d33febd57dd414dc5f4d3558
 2014-09-03 23:18:20 +09:00
Jason Monk
52c4f64666 am 46295dc1: Merge "Don\'t show add user for simple user switcher" into lmp-dev 
* commit '46295dc11a3224b39aa4ac87c49a21bd9c1126f4':
  Don't show add user for simple user switcher
 2014-09-03 14:16:21 +00:00
Jason Monk
cde8e8f91c Merge "Don't show add user for simple user switcher" into lmp-dev 2014-09-03 14:09:25 +00:00
Jason Monk
a73cbf8287 am 9df55f5e: Merge "Correct hotspot notification asset" into lmp-dev 
* commit '9df55f5e29729457b4364a2d761600da9de065a6':
  Correct hotspot notification asset
 2014-09-03 13:08:15 +00:00
Jason Monk
ab91856572 am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 
* commit '7023f0f25871c48d952f9c8cdd3985c04bb8d237':
  Enforce permissions on start/stopLockTaskModeOnCurrent
 2014-09-03 13:08:10 +00:00
Jorim Jaggi
db13a60f6e am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit '947de838385f3d0c271ff82d238ac58ba609acde':
  Status bar iconography updates
 2014-09-03 13:08:06 +00:00
Jason Monk
d4c2f3973c Merge "Correct hotspot notification asset" into lmp-dev 2014-09-03 12:59:44 +00:00
Jason Monk
cc1f2c08e3 Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 2014-09-03 12:59:35 +00:00
Jorim Jaggi
0c06d6bff1 Merge "Status bar iconography updates" into lmp-dev 2014-09-03 12:56:16 +00:00
Christoph Studer
fe5fe6431b am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 12:37:52 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Selim Cinek
7ff6eb6429 Correctly forwarding the screen off event on lockscreen 
Bug: 17364635
Change-Id: I88730238e3622522674268438d266fd2334410cd
 2014-09-03 14:18:09 +02:00
Robert Craig
2f446561f2 SELinuxMMAC unit tests 
Added unit tests to help with future integration and regression
testing.

Change-Id: I5e7d709e80ccbbe1dde1dc26b3e9a155f5009ad1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-09-03 08:05:40 -04:00
Sander Alewijnse
7628d171f5 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
 2014-09-03 11:55:01 +00:00
Esteban Talavera
808f6ef2ac Pass ComponentName to probing certificate methods 
Pass ComponentName and check whether that admin is a profile owner on DPM
get/has certificate methods (requested on the API review).

As per Change I55eec17e01489ab323f8a0e68b11592605a7b740, not keeping track of
which admins installed which certificates for now:

"Having per-admin CA certificates would be a fair bit of work. The only MDMs
we're opening this up to for now are Device and Profile Owners which 100%
manage the profile so will be the only admin.
It seems like if we keep track of "who installed which certs" it'll be a little
pointless because the answer will always be "the ProfileOwner" for every single
one."

Bug: 17005622
Change-Id: I45e9dac5236ab4ed235a341c208ac3cb6aba17da
 2014-09-03 11:50:55 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle. 
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
 2014-09-03 12:26:08 +01:00
Yohei Yukawa
5cde200201 am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
 2014-09-03 09:50:10 +00:00
Yohei Yukawa
851377f90c Merge "API Review: InputConnection" into lmp-dev 2014-09-03 09:41:48 +00:00