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

199839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
304e377227 Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev 2015-09-02 20:43:04 +00:00
Jorim Jaggi
bf04cf51e6 Fix wrong mode for fingerprint unlock when bouncer not showing 
Bug: 23748205
Change-Id: I4c751fcbb99d1f409a1433309e795addf1a2232c
 2015-09-02 11:53:02 -07:00
Tim Kilbourn
7cd6aaafda am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 
* commit 'ee72f99dd14c8e531cd1a114d162a49636e7b809':
  Allow shell to disable keyguard when not secure
 2015-09-02 17:40:36 +00:00
Tim Kilbourn
ee72f99dd1 Merge "Allow shell to disable keyguard when not secure" into mnc-dev 2015-09-02 17:28:08 +00:00
Clara Bayarri
582b186cd3 am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit 'f7b220ab9f62be3d279e3fa7923c249ff0fa09f3':
  Fix Custom action mode menu item onclick is not working
 2015-09-02 09:59:36 +00:00
Clara Bayarri
f7b220ab9f Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 2015-09-02 09:31:06 +00:00
Vineeta Srivastava
dd124802a7 Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev 2015-09-02 07:29:33 +00:00
Hyejin
85ca8141f5 set config_use_sim_language_file false for KR LGU+/KT 
BUG=23611386
Change-Id: Ifb635ccab9994f0bc2c0a75b539f29d71111b1ed
 2015-09-01 23:43:13 -07:00
Roshan Pius
a14e900181 Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev 2015-09-02 06:06:45 +00:00
Selim Cinek
2af5010a67 am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev 
* commit '36a75d6aefcddb91df7d513292d346f1f51ec702':
  Fixed a crash in the notification group manager
 2015-09-02 00:54:32 +00:00
Deepanshu Gupta
0e150a8b94 am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit '0c5fd7e3791f0b1a3a3b1c1ebe34f568155ba11f':
  LayoutLib: Fix typedArray caching.
 2015-09-02 00:54:26 +00:00
Jim Miller
be342fc3c7 Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev 2015-09-02 00:32:11 +00:00
Selim Cinek
36a75d6aef Merge "Fixed a crash in the notification group manager" into mnc-dev 2015-09-02 00:25:05 +00:00
Deepanshu Gupta
0c5fd7e379 am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'eb54172719db60740a0b8dde6380db54d4006159':
  LayoutLib: Fix typedArray caching.
 2015-09-02 00:11:24 +00:00
Selim Cinek
0b4aeab281 Fixed a crash in the notification group manager 
When 2 notifications were posted as the summary of the same
group, then the system would eventually crash.

Bug: 23676310
Change-Id: Ia8f95e624f3f43d1b55169dd8102e3c89427dc76
 2015-09-02 00:10:45 +00:00
Deepanshu Gupta
eb54172719 am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
  LayoutLib: Fix typedArray caching.
 2015-09-01 23:59:10 +00:00
Jim Miller
975f145c01 Only allow foreground app and keyguard to access FingerprintManager 
Fixes bug 21309357
Fixes bug 23566317

Change-Id: Ie776c36e2cc5c15a8789d76b604a9c7507efb605
 2015-09-01 16:57:36 -07:00
Deepanshu Gupta
dd21212fa1 am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'eb26f5cecd5366b29b3cb746a7edaf3769f40480':
  LayoutLib: Fix typedArray caching.
 2015-09-01 23:40:40 +00:00
Filip Gruszczynski
991e493616 am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev 
* commit 'cbacd4f0cee10b63adf6e2d482e7b4f62c0104a0':
  Don't perform layout while adjusting displays/stacks state.
 2015-09-01 23:33:58 +00:00
Eino-Ville Talvala
7e28b3bced am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev 
* commit 'f50d4ce6d31c8401b36cbf07df75264bc417519d':
  DO NOT MERGE: Fix DngCreator default crop calculations.
 2015-09-01 23:33:54 +00:00
Selim Cinek
146dc26511 am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 
* commit '9a2d5742bd11c2a7a583d53b1ef1ad12d75e239e':
  Fixed when the notification effects are being cleared
 2015-09-01 23:33:50 +00:00
Deepanshu Gupta
eb26f5cecd LayoutLib: Fix typedArray caching. 
The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
 2015-09-01 23:17:56 +00:00
Filip Gruszczynski
cbacd4f0ce Merge "Don't perform layout while adjusting displays/stacks state." into mnc-dev 2015-09-01 23:11:46 +00:00
Eino-Ville Talvala
f50d4ce6d3 Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev 2015-09-01 23:06:17 +00:00
Selim Cinek
9a2d5742bd Merge "Fixed when the notification effects are being cleared" into mnc-dev 2015-09-01 23:00:25 +00:00
Jim Miller
e45761ff90 Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev 2015-09-01 22:58:43 +00:00
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
Jim Miller
c467bd641f Fix broken enter key after failed PIN attempts. 
Fixes bug 23699953

Change-Id: Id099443b830f5608c0bf955075c3407b401f3d53
 2015-09-01 15:21:55 -07: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
Tim Kilbourn
bba73a038e Allow shell to disable keyguard when not secure 
Bug: 22694837
Change-Id: I0f08048f617d064017468f331a5c6875ab27174b
 2015-09-01 14:21:09 -07:00
Ruben Brunk
1f384ee51c DO NOT MERGE: Fix DngCreator default crop calculations. 
Bug: 23591407
Bug: 23697593
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
 2015-09-01 20:45: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
Roshan Pius
a9acb4c2b5 Reformat only KR numbers with leading "+82". 
Looks like the phonenumber util can figure out the country code of a
phone number to format from the localization data even if it is not
explicitly present in the phone number string. So, adding an explicit
check to make sure that the country code(+82) was fetched from the
original number string which was the intention of the fix for
b/22862845.

BUG: 23661668
Change-Id: I26ba03d759e0ec35a195ba51bf60d09eff8de090
 2015-09-01 09:24:32 -07:00
Clara Bayarri
ea2d644923 Fix Custom action mode menu item onclick is not working 
BUG: 23575152
Change-Id: I7c07a769bd03c2d756e04f16296f418e965a993f
 2015-09-01 17:18:05 +01: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
Filip Gruszczynski
d66af6a655 Don't perform layout while adjusting displays/stacks state. 
When we detach the stack from the display we are in an inconsistent
state. We need to finish that operation, before we start laying out
things again. Otherwise we will encounter subtle bugs, where stack is
partially closed, but still used during the layout.

Display detachment was already doing the right thing and scheduling a
layout after it finishes the display detach. However, removing the
stack's windows was triggering immediate relayout and causing a crash.

This CL also adds some missing synchronization around
WindowManagerService.mStackIdToStack, which is in most cases protected by
mWindowMap.

Bug: 22191609
Bug: 23615329
Change-Id: I1e2fc42e1a5b673be808acdec473f85f138d7062
 2015-08-31 17:32:37 -07: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
Selim Cinek
6577cae496 Fixed when the notification effects are being cleared 
Previously the notification effects were not correctly cleared in certain
cases and the user could end up in a state where the notification light would
always blink.

Bug: 22931139
Change-Id: I9a71e56cf4479354a9d773b5b6f0edd7693f2b05
 2015-08-31 23:24:28 +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