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

170335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Cheuksan Wang
109ec376da Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 2014-12-04 00:19:06 +00:00
John Reck
bd15e4f59c Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 2014-12-04 00:08:16 +00:00
Winson Chung
ba1307b2b4 Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* changes:
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 00:07:57 +00:00
Jim Miller
3ea6824034 Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 2014-12-03 23:44:32 +00:00
xinhe
8f61e7549e Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 2014-12-03 23:39:32 +00:00
xinhe
18b9c3cb50 Unable to unlock SIM with a PIN/PUK 
call TelephonyManager.getSimState instead of accessing systemProperty
Bug:18489776

Change-Id: I45d2315a588f706c4815750963dcfec9f8409c5d
 2014-12-03 23:36:16 +00:00
Jim Miller
8b6bd4d3f4 Stop keyguard from spamming the log 
Fixes bug 18147652

Change-Id: I9f6d3a6f1b8e3d6443c112ecf8a61ea2dc4e3434
 2014-12-03 15:33:13 -08:00
Wink Saville
82611e6d9c Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 2014-12-03 23:32:46 +00:00
Christopher Tate
758f45217d Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 2014-12-03 23:09:34 +00:00
Robert Greenwalt
98f81182fb am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type
 2014-12-03 23:00:34 +00:00
Eino-Ville Talvala
6e21817b8e am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-03 23:00:15 +00:00
Robert Greenwalt
647b437d07 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 2014-12-03 22:18:24 +00:00
Eino-Ville Talvala
d23f8b44d5 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 2014-12-03 22:01:42 +00:00
Winson Chung
b255e49fe4 Ensuring that the alpha and translation animation durations are the same. (Bug 18609321) 2014-12-03 13:45:36 -08:00
Dianne Hackborn
e6333e5188 am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'f696efa206089bde1274d972239ffb5a8185f613':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-03 21:38:08 +00:00
Dianne Hackborn
f696efa206 Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 2014-12-03 21:32:17 +00:00
Winson Chung
fc33cdf71d Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776) 2014-12-03 13:16:48 -08:00
Alan Viverette
3977137d86 am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit 'd3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
  Slightly more button elevation to match Material spec
 2014-12-03 21:12:30 +00:00
Dianne Hackborn
4c4e4686d5 am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '281f36f5483ade3800092a42109327347d8aaff6':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-03 21:12:24 +00:00
Alan Viverette
d3adf0986b Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 2014-12-03 21:10:21 +00:00
Christopher Tate
31f25696d9 Adjust wallpaper-restore acceptance criteria 
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
 2014-12-03 13:07:24 -08:00
Dianne Hackborn
281f36f548 Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 2014-12-03 21:06:55 +00:00
John Spurlock
621afac810 Doze: Don't block pickup pulses on a proximity check. 
Pulse immediately, assuming the pickup sensor will not fire
if prox=near.  Perform a non-blocking additional proximity check
in these cases purely to collect verification diagnostics.

Also tweak the interpolator for pickup pulses to ramp up more
quickly.

Bug: 18373928
Change-Id: I8607f4b37435722e293db741c273914183cec7be
 2014-12-03 16:04:28 -05:00
John Reck
01a5ea35fb Resume RT-animations after a pauseSurface 
Bug: 18203577

The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.

To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.

Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
 2014-12-03 13:03:59 -08:00
Deepanshu Gupta
6cbef4bd3e am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '03af0c42d80734c44198b96a99488bb94816ae97':
  Ensure that RandomAccessFile is not leaked.
 2014-12-03 20:58:27 +00:00
Deepanshu Gupta
4628d51a0d am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '141c7614fdef45d1a95ccb325da762a79412aae2':
  Fix AnalogClock rendering
 2014-12-03 20:58:23 +00:00
Deepanshu Gupta
fb30a783d3 am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-dev 
* commit '7e55c29281f8a62154451e87b45d95ec5f97c5ac':
  Fix typos in previous bugfixes.
 2014-12-03 20:58:19 +00:00
Yin-Chia Yeh
871571ae0c am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '381343088f964b6428c483f741424a50ef41cb49':
  Camera: update antibanding spec
 2014-12-03 20:54:23 +00:00
Michael Wright
c0707c007d am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit '83de9a426ab3d8f1e1473fd438ab9cde3d65f283':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-03 20:54:16 +00:00
Michael Wright
fc09908b8a am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit '70d8133cc3db2742980ec4157322c08eaebf6e6b':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-03 20:54:10 +00:00
Deepanshu Gupta
03af0c42d8 Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 2014-12-03 20:49:56 +00:00
Deepanshu Gupta
141c7614fd Merge "Fix AnalogClock rendering" into lmp-dev 2014-12-03 20:49:26 +00:00
Deepanshu Gupta
7e55c29281 Merge "Fix typos in previous bugfixes." into lmp-dev 2014-12-03 20:48:56 +00:00
Dianne Hackborn
8b22252a6c Fix issue #18607384: Run fstrim after every system update 
Change-Id: I06f4c0b9e6834a8c8bd85710dfd9fa16471b6ad2
 2014-12-03 12:44:48 -08:00
John Spurlock
c9b862cfc4 am 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 
* commit '06eaac4463015d9ff93c694603bb9398b065f502':
  Doze: Fast path for pickup pulses.
 2014-12-03 20:44:30 +00:00
Yin-Chia Yeh
381343088f Merge "Camera: update antibanding spec" into lmp-mr1-dev 2014-12-03 20:44:05 +00:00
Sreeram Ramachandran
3a8fbb8072 am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.
 2014-12-03 20:43:50 +00:00
Etan Cohen
a2ab707c87 am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 20:43:46 +00:00
Craig Mautner
62a7022f7d am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 
* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
  Handle keyguard dismiss flags correctly
 2014-12-03 20:43:40 +00:00
Trevor Johns
8e78f0a712 am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '9aa9e46b4e02e5f39752d93a3aa0645ede056fa9':
  Docs: Add "admin" to samples categories
 2014-12-03 20:43:03 +00:00
Trevor Johns
d0dca6f322 am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'f560f334b0784ebeea86997d391e1245590d131d':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 20:42:58 +00:00
Trevor Johns
8db20dc19d am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '2047e6a0d1f40e2187f1d7b9f8c7d2d5e97ec8cf':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 20:42:51 +00:00
Winson Chung
fee5e3d32a am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 20:42:45 +00:00
Evan Charlton
c0362c5da3 am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '10dff0a710b46cc1ddf554e6c83941a201aa6150':
  Re-add Connection.getCallCapabilities
 2014-12-03 20:42:39 +00:00
Nancy Chen
5125dc1cbc am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit 'a1163d575b41580352e39dde455ef2f1f7fbcbf4':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 20:42:34 +00:00
Paul Jensen
3249d63704 am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit '3107a9ad244004938ff7d5d731b3973113344da4':
  Retry failed network validation every 10 minutes.
 2014-12-03 20:42:28 +00:00
Adam Lesinski
455550d586 am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 20:42:22 +00:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 20:42:17 +00:00
Michael Wright
83de9a426a am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit 'da79c87f2e4502b02c29e9081dcdf52a742d29e5':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-03 20:41:52 +00:00