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

199806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vineeta Srivastava
860aa1e1b0 Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev 2015-09-01 22:55:54 +00:00
Svetoslav
692286008c am fb9ec507: Incorrect app op check in broadcast queue 
* commit 'fb9ec50795142c24b56dd28e45f5012b9b445380':
  Incorrect app op check in broadcast queue
 2015-09-01 22:39:46 +00:00
Svetoslav
fb9ec50795 Incorrect app op check in broadcast queue 
An intent broadcaster can specify which permissions should be
held by a receiver to get the broadcast. These permissions may
have corresponding app ops and if this is the case we also
check the app ops. There is a bug in broadcast queue where if
a permission does not have an app op we still try to check this
app op and get an exception as the app op does not exist. This
did not manifest often because the broadcast API takes an
optional app op against which is compared the app op for each
permission and if they differ the app op for the permission is
checked.

bug:23725305

Change-Id: Iec56ee354bbc11e7bc245134cf3afd2c11eecbc4
 2015-09-01 14:45:21 -07: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
Sungmin Choi
7e68e24646 Do not show roaming icon for NL KPN network with Telfort SIM 
Bug: 23707729
Change-Id: I9c27e814b652c1e3d3a1d75c0f4e51ed153ec3ae
 2015-09-01 12:06:09 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
acace94c17 Fix race condition by guarding callbacks 
Bug: 23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
 2015-08-28 22:08:03 +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
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