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

153114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
df1bbf4d38 am 1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev 
* commit '1ad40a966096c277123cf3d15a4ccdb2cd8af566':
  Fix boot loop when deriving device name.
 2014-09-12 23:13:42 +00:00
Robert Greenwalt
620a5ffdd7 am da8158b1: Merge "Better handling of unvalidated networks." into lmp-dev 
* commit 'da8158b1f4b87dac9838f1bb7c515ba6b2b7dd3b':
  Better handling of unvalidated networks.
 2014-09-12 23:13:38 +00:00
Jeff Sharkey
e0d0863c79 am 4a06f52a: Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev 
* commit '4a06f52aa174d411d22c9999742a93bf2d2b7099':
  Add xxxhdpi assets for DocumentsUI.
 2014-09-12 23:13:32 +00:00
Jeff Sharkey
c713bf79dd Merge "Fix boot loop when deriving device name." into lmp-dev 2014-09-12 23:00:48 +00:00
Robert Greenwalt
61642ce8c3 Merge "Better handling of unvalidated networks." into lmp-dev 2014-09-12 23:00:37 +00:00
Jeff Sharkey
69aada9c7f Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev 2014-09-12 23:00:06 +00:00
George Mount
72b9c1491e am 17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev 
* commit '17506bdb89a323a31e27cbff24fec4c819a71582':
  Allow Path Animations to support overshooting.
 2014-09-12 22:58:53 +00:00
Dianne Hackborn
3ca644f1b4 am 8b01fb7e: Merge "Fix issue #17479850: AppOpsManager.checkPackage() allows..." into lmp-dev 
* commit '8b01fb7eeeec0431cfb5f51e191a1418423f88ed':
  Fix issue #17479850: AppOpsManager.checkPackage() allows...
 2014-09-12 22:58:48 +00:00
Jeff Sharkey
ad59c43072 Fix boot loop when deriving device name. 
Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
 2014-09-12 15:56:30 -07:00
Adam Powell
eb865e9545 am af7ba5de: Merge "Add contentDescription for material action mode close button" into lmp-dev 
* commit 'af7ba5dee4454f946ba8e2a3a87205a07bf63171':
  Add contentDescription for material action mode close button
 2014-09-12 22:49:48 +00:00
Tsuwei Chen
3ba9b1254a am 4290fb7b: Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev 
* commit '4290fb7b4499c5ec01a6df3a20de7a8fd63bdd97':
  Handle user privacy properly during network initiated requests. Bug: 16131208
 2014-09-12 22:49:43 +00:00
Dianne Hackborn
760a86e49a am a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev 
* commit 'a561b2377fd1f8749a30fe19d6df5e3d8afc3292':
  Allow throwing UnsupportedOperationException across Binder.
 2014-09-12 22:49:33 +00:00
George Mount
64ec46dbb0 Merge "Allow Path Animations to support overshooting." into lmp-dev 2014-09-12 22:48:28 +00:00
George Mount
bc68f5adc2 Allow Path Animations to support overshooting. 
Bug 17458698

Change-Id: I7a29fc8932a28121d7db8b3bf695d91a55ef059b
 2014-09-12 15:46:02 -07:00
Dianne Hackborn
39b278798e Merge "Fix issue #17479850: AppOpsManager.checkPackage() allows..." into lmp-dev 2014-09-12 22:45:01 +00:00
Adam Powell
457b62d923 Merge "Add contentDescription for material action mode close button" into lmp-dev 2014-09-12 22:43:46 +00:00
Dianne Hackborn
0fcef84cca Fix issue #17479850: AppOpsManager.checkPackage() allows... 
...root or shell to claim any package name

Re-arrange so checkPackage() doesn't go through the path where
the package name will be forced for root and shell uids.

Change-Id: I450cd6ac8148afd75b526724afdf46ab63de4c43
 2014-09-12 15:38:33 -07:00
Tsuwei Chen
ae69f9fdb3 Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev 2014-09-12 22:36:53 +00:00
Dianne Hackborn
8190b79d37 Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev 2014-09-12 22:35:48 +00:00
Svetoslav
ba46eb6b6d am 60eed0e5: Merge "Fix crash in spooler if printing app dies." into lmp-dev 
* commit '60eed0e500c2d5964431d9afd6b72b40040448ed':
  Fix crash in spooler if printing app dies.
 2014-09-12 22:31:39 +00:00
Guang Zhu
e6acc875a6 am 336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev 
* commit '336a93165a5e3383b6cf2479222cc18ae85aedaf':
  do not allow monkey to flip OEM unlock flag
 2014-09-12 22:31:35 +00:00
Adam Powell
a75356e1ab Add contentDescription for material action mode close button 
Bug 17487633

Change-Id: Ib61723719f3a3b076ac8136e578748cfa6db8770
 2014-09-12 15:31:32 -07:00
ztenghui
fb3cd6c869 am 2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev 
* commit '2bb77b5a90b84c0fbe9055799dabf359b4e7d3ff':
  Add root alpha and animation to (Animated)VectorDrawable
 2014-09-12 22:31:29 +00:00
Svetoslav
80adf03d6f Merge "Fix crash in spooler if printing app dies." into lmp-dev 2014-09-12 22:23:40 +00:00
Guang Zhu
112d0abb0d Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev 2014-09-12 22:20:20 +00:00
Guang Zhu
514c580459 do not allow monkey to flip OEM unlock flag 
Bug: 11435021
Change-Id: I3a6865bc6c9fde245d8f4af3230716eac4a3f1b1
 2014-09-12 22:17:14 +00:00
George Mount
37f2a0ee5a am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev 
* commit '9032c75779ea43428b84cd959cc62a219f4d2612':
  Fixed: getDecor() NullPointeExceptions.
 2014-09-12 22:12:58 +00:00
Amith Yamasani
8f9e3a06f1 am 849e1a9c: Merge "Prevent device owner registration after setup is complete" into lmp-dev 
* commit '849e1a9c39284ea016d5576f63676748eff36c12':
  Prevent device owner registration after setup is complete
 2014-09-12 22:12:53 +00:00
ztenghui
74cc5c39ae Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev 2014-09-12 22:12:03 +00:00
ztenghui
8490354dc6 Add root alpha and animation to (Animated)VectorDrawable 
b/17393626

Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
 2014-09-12 15:11:10 -07:00
George Mount
e0947064af Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev 2014-09-12 22:02:37 +00:00
Yin-Chia Yeh
a6d85a403c am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev 
* commit 'e3505a3d5e8968eaad68fd12717696f17e9414f9':
  Camera2: add toString for TonemapCurve
 2014-09-12 22:00:41 +00:00
George Mount
4b8a002a73 am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev 
* commit 'cc8973e45b989fc2380acbc9773e4b1208692891':
  Reset the alpha for offscreen views.
 2014-09-12 22:00:37 +00:00
Adam Powell
71342dce1e am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev 
* commit '91089aa5f78c8c6b90a3a519cd5512c458872969':
  Make Toolbars eat touch events
 2014-09-12 22:00:32 +00:00
Amith Yamasani
48766577d4 Merge "Prevent device owner registration after setup is complete" into lmp-dev 2014-09-12 21:59:46 +00:00
Tsuwei Chen
7c485bf66a Handle user privacy properly during network initiated requests. 
Bug: 16131208

Change-Id: Ic6f83fcf24eef9e0e26e303bb652651f0dc2970a
 2014-09-12 14:56:00 -07:00
Yin-Chia Yeh
8eec09a1fc Merge "Camera2: add toString for TonemapCurve" into lmp-dev 2014-09-12 21:55:12 +00:00
George Mount
54f4ba8d7a Merge "Reset the alpha for offscreen views." into lmp-dev 2014-09-12 21:52:28 +00:00
Jeff Sharkey
3ad3b4f11a Add xxxhdpi assets for DocumentsUI. 
Bug: 17486169
Change-Id: I26fd257ab9404b1c3985ee6861c9b81ec5e581bc
 2014-09-12 14:50:59 -07:00
Adam Powell
f116056a80 Merge "Make Toolbars eat touch events" into lmp-dev 2014-09-12 21:49:25 +00:00
George Mount
124d3346eb am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit 'f607a73b9cfe059739b245d8aff70ed2747334c6':
  Changed method name to match Activity's method name.
 2014-09-12 21:43:54 +00:00
George Mount
26f68a01b4 Merge "Changed method name to match Activity's method name." into lmp-dev 2014-09-12 21:28:45 +00:00
Dianne Hackborn
33d738a102 Allow throwing UnsupportedOperationException across Binder. 
Change-Id: I3a9b81958886033d546c3a20331716dbb9492365
 2014-09-12 14:23:58 -07:00
Dianne Hackborn
2f30e38230 am 019a55d1: Merge "Revert "Set up final resource identifiers."" into lmp-dev 
* commit '019a55d1976b1611c9a6a57b094ca0b1da8bb469':
  Revert "Set up final resource identifiers."
 2014-09-12 21:20:10 +00:00
Dianne Hackborn
603eae7241 am 1379b508: Merge "Set up final resource identifiers." into lmp-dev 
* commit '1379b5081522e03be4f2d9063321040945bed03a':
  Set up final resource identifiers.
 2014-09-12 21:20:05 +00:00
George Mount
85ea498d86 Changed method name to match Activity's method name. 
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
 2014-09-12 14:19:40 -07:00
Yin-Chia Yeh
b086421b41 Camera2: add toString for TonemapCurve 
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
 2014-09-12 14:12:13 -07:00
Adam Powell
61d15b9856 Make Toolbars eat touch events 
Just like action bars, toolbars shouldn't allow touches to fall
through to sibling views that they overlap.

Bug 17483356

Change-Id: I9068e1f9cf3c4226000e0058c371283a997b1bd0
 2014-09-12 14:11:28 -07:00
Dianne Hackborn
86ae74b129 Merge "Revert "Set up final resource identifiers."" into lmp-dev 2014-09-12 21:03:59 +00:00
Dianne Hackborn
5128efa648 Revert "Set up final resource identifiers." 
This reverts commit 5dea4bd5cd24f188bec7a91e25f644fc198c52d4.

Change-Id: Ib143e2a3fd58f20b03a408beed4b7dbdf69cbe79
 2014-09-12 21:01:36 +00:00