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

204551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
e2565aecca am e20eff91: am 3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev 
* commit 'e20eff91a429465bb92e0f3a21d6d7e31f2114df':
  Enable migration to big cores for app launches.
 2015-09-01 21:43:13 +00:00
Tim Murray
e20eff91a4 am 3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev 
* commit '3491da4eb3714556ac908777be3a55f2e200bf0b':
  Enable migration to big cores for app launches.
 2015-09-01 21:33:36 +00:00
Tim Murray
3491da4eb3 Merge "Enable migration to big cores for app launches." into mnc-dr-dev 2015-09-01 21:23:38 +00:00
Zhentao Sun
0a247995d7 am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev 
* commit 'aa06c8089a7d417a240004e785239f00ba1af0ec':
  Don't launch the camera if it already in foreground.
 2015-09-01 00:58:38 +00:00
Jorim Jaggi
d302508d28 am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets 
* commit '4a306fd744bc2f6f434cb7032580b063b704a9c5':
  Add a private API to get notified about lockout resets
 2015-09-01 00:58:31 +00:00
Zhentao Sun
aa06c8089a am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev 
* commit '363c694a448d90322936526d78a9878de0003d0e':
  Don't launch the camera if it already in foreground.
 2015-09-01 00:47:04 +00:00
Jorim Jaggi
4a306fd744 am 3a464785: Add a private API to get notified about lockout resets 
* commit '3a464785088e7fd206666f640912729533948ce8':
  Add a private API to get notified about lockout resets
 2015-09-01 00:47:00 +00:00
Zhentao Sun
363c694a44 Merge "Don't launch the camera if it already in foreground." into mnc-dr-dev 2015-09-01 00:40:39 +00:00
Jorim Jaggi
3a46478508 Add a private API to get notified about lockout resets 
SystemUI uses it to start authentication again after lockout reset
expired.

Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
 2015-09-01 00:37:54 +00:00
Christopher Ferris
d6597cb43c am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit '1bc7d0c84a1fbd27add883b8e000096677a1ca22':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:31:30 +00:00
Christopher Ferris
1bc7d0c84a am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit '70c958c414204b195d4195cdcafe33932087e6b1':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:23:02 +00:00
Christopher Ferris
70c958c414 Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 2015-09-01 00:14:16 +00:00
Christopher Ferris
a8a795428a Save/restore errno in SIGCHLD handler. 
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.

Bug: 23572286
Bug: 23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
 2015-08-31 16:36:14 -07:00
Todd Kennedy
f7bf24ad1d am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit '9fe274d638413b7342246836c344b442ebcfa64c':
  Ensure host is set before onInflate()
 2015-08-31 23:05:49 +00:00
Bart Sears
9030dabad5 am 2d7df3ef: am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit '2d7df3ef8d0fab3887001f1824a537c98a7a2457':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 23:05:43 +00:00
Tao Bao
f86894cb9c am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit 'a42870fcd6bbd15326fea45e156bd2462bf8a78a':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 23:05:34 +00:00
Todd Kennedy
9fe274d638 am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit '9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
  Ensure host is set before onInflate()
 2015-08-31 22:57:52 +00:00
Bart Sears
2d7df3ef8d am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit 'd66d4d1bea063acefae6bab5faf822d7a363b216':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 22:57:47 +00:00
Tao Bao
a42870fcd6 am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '188a33c7acb53fb59364b82a41ec9270f6aef5cf':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:57:44 +00:00
Todd Kennedy
9e25e1645f am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
  Ensure host is set before onInflate()
 2015-08-31 22:45:23 +00:00
Bart Sears
d66d4d1bea am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit '627975fca234bfc62d60904547ba3fb2ac675ec8':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 22:45:19 +00:00
Tao Bao
188a33c7ac am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:45:15 +00:00
Todd Kennedy
e7078e181c Merge "Ensure host is set before onInflate()" into mnc-dev 2015-08-31 22:35:58 +00:00
Bart Sears
627975fca2 am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit '74890df7267d1c203fdbc5e90052f723a3c89f3d':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 22:32:22 +00:00
Tao Bao
7b7a3e75c3 am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '0bafa33fcdebeaf6bdfd36a3f75e461d630b86bc':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:32:17 +00:00
Bart Sears
74890df726 am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit '3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 22:20:06 +00:00
Tao Bao
0bafa33fcd am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '35c1eb9e6506b407a1af40359d48bb06d884385d':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:19:58 +00:00
Bart Sears
3cb7e91f2c am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 
* commit '199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-08-31 22:03:48 +00:00
Tao Bao
35c1eb9e65 am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '82b70db7dd906013d131737a5bec2ae59b41ae61':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:03:44 +00:00
Bart Sears
199c74eab1 Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 2015-08-31 21:53:46 +00:00
Tao Bao
82b70db7dd [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
 2015-08-31 14:34:14 -07:00
Tyler Gunn
603cfdcea1 am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev 
* commit '6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2':
  Rename carrier config constant.
 2015-08-31 21:25:17 +00:00
Tyler Gunn
6a9baca06e am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev 
* commit '7878eee8a9c20752e038f563b98b6b42c372cd0f':
  Rename carrier config constant.
 2015-08-31 21:14:55 +00:00
Todd Kennedy
0aa69b7dc5 Ensure host is set before onInflate() 
Bug: 22512520
Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
 2015-08-31 14:10:04 -07:00
Tyler Gunn
7878eee8a9 Merge "Rename carrier config constant." into mnc-dr-dev 2015-08-31 21:01:19 +00:00
Selim Cinek
406b60aca6 am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 
* commit 'b8645fa79e06c2e5cb87eb7fddccf3d2679c5f71':
  Fixed a bug where the secure camera would flash when rotated
 2015-08-31 20:47:50 +00:00
Selim Cinek
b8645fa79e am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 
* commit 'a7cad8e8a4d698bd3880299265760f5158073e2d':
  Fixed a bug where the secure camera would flash when rotated
 2015-08-31 20:37:26 +00:00
Adrian Roos
9cb060d0c3 am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev 
* commit '7e1775d246371422ae60ec4d825d70bc067a8962':
  Disable fingerprint after force lock
 2015-08-31 20:27:55 +00:00
Bart Sears
aaebdd7f91 am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '02be93160a246323f0a17f831e4e8bf56d65d415':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:27:49 +00:00
Selim Cinek
a7cad8e8a4 Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 2015-08-31 20:27:48 +00:00
Adrian Roos
7e1775d246 am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev 
* commit '781953123e5b0f0f85691eabc13b3430c3054a10':
  Disable fingerprint after force lock
 2015-08-31 20:16:57 +00:00
Bart Sears
02be93160a am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:16:53 +00:00
Tyler Gunn
6ef57c3366 Rename carrier config constant. 
Bug: 23063217
Change-Id: I0050f0009a7681df1b04edbbd9331bc2918464a2
 2015-08-31 13:15:27 -07:00
Tyler Gunn
b63db9fd98 am 3bd58233: am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev 
* commit '3bd58233ab3ec8509a3f8922344ae30a330f5159':
  Add carrier config for allowing non-emerg calls in ECM mode.
 2015-08-31 20:07:46 +00:00
Adrian Roos
781953123e Merge "Disable fingerprint after force lock" into mnc-dr-dev 2015-08-31 20:04:46 +00:00
Bart Sears
06fb3b2da8 am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '0e2e85898743a070a0c42036fa9d841694819a00':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:02:34 +00:00
Tyler Gunn
3bd58233ab am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev 
* commit 'd833cb54537b81d49b6563afb7583d4b36e19c51':
  Add carrier config for allowing non-emerg calls in ECM mode.
 2015-08-31 19:55:55 +00:00
Bart Sears
0e2e858987 Merge "Don't throttle "while idle" alarms while not dozing" into mnc-dev 2015-08-31 19:49:11 +00:00
Tyler Gunn
d833cb5453 Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev 2015-08-31 19:46:12 +00:00
Adam Lesinski
d0ce1fbbba am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit '69e17f59f8aaccbe66ea9ef976d01f076a7a06c3':
  BatteryStats: Start using cpu power from kernel
 2015-08-31 19:23:44 +00:00