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

201062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
69e17f59f8 am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
  BatteryStats: Start using cpu power from kernel
 2015-08-31 19:13:39 +00:00
Adam Lesinski
da43a3aaca Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 2015-08-31 19:04:46 +00:00
Tyler Gunn
387ce2fb81 Add carrier config for allowing non-emerg calls in ECM mode. 
Default value is TRUE for all carriers, meaning that non-emergency calls
are allowed even when the phone is in emergency callback mode.

Bug: 23063217
Change-Id: I4a227ce64a1e594a055560f42c7611c8eccdae0f
 2015-08-31 17:46:54 +00:00
Sungmin Choi
dd8efa820b Add TDSCDMA family 
Bug: 22639018
Change-Id: I7a65337838ef3dfa24ce8b59564ec831c5cb5094
 2015-08-31 10:41:49 -07:00
Sungmin Choi
369808638b Telephony: Add TD-SCDMA SignalStrength 
Bug: 22639018
Change-Id: I0381e18fb65807c88290df1f2333b2636f0b0c18
 2015-08-31 10:41:32 -07:00
Svetoslav Ganov
bbd723ce63 am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit '144c4ff08a0be40e6b8af1bca269b33557923d71':
  Fix a NPE when shutting down instrumentation
 2015-08-31 17:33:09 +00:00
Svetoslav Ganov
144c4ff08a am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit '4cb113ed72b771d3148c00a025eb8bc949ff6a41':
  Fix a NPE when shutting down instrumentation
 2015-08-31 17:22:53 +00:00
Svetoslav Ganov
4cb113ed72 Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 2015-08-31 17:16:23 +00:00
Bryce Lee
ad9a0efc07 Merge "Add capability for a connection hand rejection text response." into cw-e-dev 2015-08-31 15:19:44 +00:00
Svet Ganov
a95f468d1f Fix a NPE when shutting down instrumentation 
bug:23657953

Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
 2015-08-30 11:00:31 -07:00
Pavel Zhamaitsiak
6611cff402 am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 
* commit 'd9efca994f99523288986f29128d696440ee4150':
  Support uneditable enhanced 4g lte mode config
 2015-08-29 22:44:41 +00:00
Geoff Mendal
8038391a08 am 469fa946: (-s ours) Import translations. DO NOT MERGE 
* commit '469fa946132b34165ea014e2eef7cd94f59171c1':
  Import translations. DO NOT MERGE
 2015-08-29 22:44:37 +00:00
Pavel Zhamaitsiak
d9efca994f Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 2015-08-29 15:40:05 +00:00
Geoff Mendal
469fa94613 Import translations. DO NOT MERGE 
Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import
 2015-08-29 08:37:22 -07:00
Jim Miller
3396a11e35 am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:26:21 +00:00
Jim Miller
3656975ef8 Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 2015-08-29 01:14:45 +00:00
Jim Miller
8b3c25a34a Run callbacks from fingerprintd through handler. 
This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.

Fixes bug 23633702

Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
 2015-08-29 01:12:46 +00:00
Zhentao Sun
04f974082e Don't launch the camera if it already in foreground. 
b/23431496. This change will not launch the Intent if the target app of
this Intent is already running in the foreground.

Change-Id: Ic8c99cf3312a2ead12dbdb94825181aed934e9f0
 2015-08-28 17:43:46 -07:00
Ian Pedowitz
6f75cb1476 am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
  Show the ResolverActivity in dock mode
 2015-08-29 00:40:19 +00:00
Sungmin Choi
8d2826bee2 Support uneditable enhanced 4g lte mode config 
Bug: 23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
 2015-08-29 00:38:56 +00:00
Ian Pedowitz
8d027e6d52 am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
  Show the ResolverActivity in dock mode
 2015-08-29 00:31:29 +00:00
Ian Pedowitz
3c227bf241 Merge "Show the ResolverActivity in dock mode" into mnc-dev 2015-08-29 00:20:27 +00:00
Selim Cinek
90b5e07c70 Fixed a bug where the secure camera would flash when rotated 
Bug: 23602571
Change-Id: I9608a004d97ad27a0f4c6da8e9d955dc644b4941
 2015-08-28 17:05:56 -07:00
Adrian Roos
0cb50efdc2 Disable fingerprint after force lock 
Bug: 23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
 2015-08-28 23:54:43 +00:00
Bryce Lee
8190168077 Add capability for a connection hand rejection text response. 
Change-Id: Id90417736bed7ab8750144ccaf3c7b449ec832b8
 2015-08-28 16:38:02 -07:00
Selim Cinek
60337b6bd7 am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev 
* commit 'e774bdd6f09a65886429a2d84a6af7e4b6352280':
  Added animation for trusted to fingerprint error
 2015-08-28 23:17:50 +00:00
Selim Cinek
e774bdd6f0 Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev 2015-08-28 23:09:19 +00:00
Jorim Jaggi
a268138380 am acace94c: Fix race condition by guarding callbacks 
* commit 'acace94c1739b08ea72dc6c2f49cf29bce6c1dac':
  Fix race condition by guarding callbacks
 2015-08-28 22:49:16 +00:00
Jorim Jaggi
acace94c17 Fix race condition by guarding callbacks 
Bug: 23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
 2015-08-28 22:08:03 +00:00
Ruben Brunk
7a193899c9 am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev 
* commit '96990d0cdd7f7757ba16b927766854e0dc6fa994':
  Fix DngCreator default crop calculations.
 2015-08-28 21:47:24 +00:00
Robert Greenwalt
77d02900d8 am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 21:47:20 +00:00
Ruben Brunk
96990d0cdd Merge "Fix DngCreator default crop calculations." into mnc-dr-dev 2015-08-28 21:42:26 +00:00
Robert Greenwalt
5799f42806 am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 21:36:39 +00:00
Robert Greenwalt
e3bcde94ca Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 2015-08-28 21:27:22 +00:00
Jorim Jaggi
e3238e53de am b774e554: Optimize fp touch to wake: Shortcut for report next draw 
* commit 'b774e554f32fd65cac30b43d1cf679403ef4af82':
  Optimize fp touch to wake: Shortcut for report next draw
 2015-08-28 20:19:31 +00:00
Jorim Jaggi
b774e554f3 Optimize fp touch to wake: Shortcut for report next draw 
When telling window manager that Keyguard window is in the correct
state for a fp-touch-to-wake sequence, it takes more than 1 frame at
the moment because the signal that WM is waiting for the next draw
is delayed by one frame because it is posted at the end of the
runnable queue.

To correctly fix this, we should post it at the beginning at the
queue, but this is way too risky this late. Instead, add a isolated
SysUI hack to report it faster.

Bug: 23401557
Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
 2015-08-28 20:07:35 +00:00
Chris Tate
27c5cfd727 am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev 
* commit '9b2f9bcb56765c52a2fc9cdcdcf11c6707403210':
  Crashing the system process is inadvisable
 2015-08-28 20:06:49 +00:00
Chong Zhang
430778bd75 am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev 
* commit '482635e34d0def1682ebc644db0636862994f649':
  Fix deadlock when updating rotation
 2015-08-28 20:06:44 +00:00
Chris Tate
9b2f9bcb56 am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev 
* commit '82d14d60e7a772ecf45b637fd51a2335ad2a40cf':
  Crashing the system process is inadvisable
 2015-08-28 19:58:35 +00:00
Chong Zhang
482635e34d Merge "Fix deadlock when updating rotation" into mnc-dr-dev 2015-08-28 19:57:57 +00:00
Chris Tate
82d14d60e7 Merge "Crashing the system process is inadvisable" into mnc-dev 2015-08-28 19:48:38 +00:00
Jeff Sharkey
90023609cf am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev 
* commit '71f1579190ee3658db15f55a4e5571f03ce431b6':
  Give shell permission to move apps.
 2015-08-28 19:48:26 +00:00