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

160620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
aefb79b2dd am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 
* commit '31bd4220855ded4ece67c8ae75227441a12a00a7':
  Remove notification for SoftAP turned on
 2014-12-04 15:16:26 +00:00
Geoff Mendal
c7d8a48bb0 am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'cc7c68b54801e07107d6e212ae50a375d730e000':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:21 +00:00
Geoff Mendal
c7b5257521 am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a821e77d7ede196f6f39cd2ed2bc974bc68e162d':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:15 +00:00
Geoff Mendal
5d1f688034 am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '72a204199510afdeb9cec483b4113433fe61089e':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:10 +00:00
Erik Kline
95b5ca9019 am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
 2014-12-04 15:16:04 +00:00
John Spurlock
959312701f am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '32b61ab28f54e5b00f472b2166f9b1100375e4ff':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 15:15:59 +00:00
Pavel Zhamaitsiak
3891681969 am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '1fb699360d1b193c5144c7dcf209d8dc8dfbb8b8':
  IMS Call End Cause Additions
 2014-12-04 15:15:53 +00:00
duho.ro
36ccf75bb2 am fb754252: UICC : discard language setting of SIM 
* commit 'fb7542522493101778862340c548db731f3a8681':
  UICC : discard language setting of SIM
 2014-12-04 15:15:40 +00:00
Cheuksan Wang
dba26aa2e7 am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '109ec376da86de1275f73fa432d6344431a457e9':
  new SMS/MMS carrier app API
 2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
  Resume RT-animations after a pauseSurface
 2014-12-04 15:15:27 +00:00
Winson Chung
4eb896ef01 am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit 'ba1307b2b42b60893c88622f41f99efa2356350d':
  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 15:15:21 +00:00
Jim Miller
f2b934b42b am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45':
  Stop keyguard from spamming the log
 2014-12-04 15:15:16 +00:00
xinhe
9a4472bf45 am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 15:14:59 +00:00
Wink Saville
0304c529b6 am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 15:14:49 +00:00
Christopher Tate
e808d2df76 am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 15:14:43 +00:00
Vinit Deshpande
31bd422085 Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 2014-12-04 06:21:30 +00:00
Geoff Mendal
2dadff70d4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:44:59 +00:00
Geoff Mendal
cc7c68b548 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 05:32:21 +00:00
Geoff Mendal
3b05d2bd6f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:05:34 +00:00
Geoff Mendal
a821e77d7e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 04:54:55 +00:00
Geoff Mendal
2253b8c576 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 04:39:37 +00:00
Geoff Mendal
72a2041995 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 04:33:28 +00:00
Erik Kline
9261d9d645 Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 2014-12-04 03:14:02 +00:00
John Spurlock
32b61ab28f Merge "Doze: Don't block pickup pulses on a proximity check." into lmp-mr1-dev 2014-12-04 03:03:22 +00:00
Pavel Zhamaitsiak
1fb699360d Merge "IMS Call End Cause Additions" into lmp-mr1-dev 2014-12-04 01:59:49 +00:00
duho.ro
fb75425224 UICC : discard language setting of SIM 
Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.

Bug: 18095177
Bug: 18108786
Change-Id: I40881fc64fea52480c968a18440740af9c8cff57
 2014-12-04 01:51:15 +00:00
Omkar Kolangade
93c33d7d90 IMS Call End Cause Additions 
Adding call end reasons for the
following use cases:
1. User rejects/ends call due to
   low battery.
2. User rejects call due to
   blacklisted call ID.

Bug: 18481702
Change-Id: I3537c732880e60218c83ec69861cb788adc57bc1
 2014-12-04 01:30:34 +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