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

204598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roshan Pius
c4809bcfa7 am 8750f04a: am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev 
* commit '8750f04a73568b2002cdd50d550822ffb53d5362':
  Reformat only KR numbers with leading "+82".
 2015-09-02 06:21:46 +00:00
Roshan Pius
8750f04a73 am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev 
* commit 'a14e900181aa03daa760e3ba6eb1e7e00d438305':
  Reformat only KR numbers with leading "+82".
 2015-09-02 06:12:56 +00: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
4997cd364d am 9e30e202: am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev 
* commit '9e30e20233136d499447622213e0f383e695dd04':
  Fixed a crash in the notification group manager
 2015-09-02 01:21:32 +00:00
Deepanshu Gupta
ee1eed7e71 am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit '7209945fd38d22078b2fd208abe0aa976c311dde':
  LayoutLib: Fix typedArray caching.
 2015-09-02 01:21:26 +00:00
Selim Cinek
9e30e20233 am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev 
* commit '2af5010a6793d27eda86432f1ec3ebbe92e1d99e':
  Fixed a crash in the notification group manager
 2015-09-02 01:08:38 +00:00
Deepanshu Gupta
7209945fd3 am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit '0e150a8b947f657a5875382bd65f37b5a07c0f79':
  LayoutLib: Fix typedArray caching.
 2015-09-02 01:08:34 +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
a32bef01a2 am 4f7d5dcd: am be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev 
* commit '4f7d5dcd662cfa4f070fd0547e30060aa65fd734':
  Only allow foreground app and keyguard to access FingerprintManager
 2015-09-02 00:50:41 +00:00
Jim Miller
4f7d5dcd66 am be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev 
* commit 'be342fc3c7a21bf22901255ed489a90c00f8bd93':
  Only allow foreground app and keyguard to access FingerprintManager
 2015-09-02 00:40:40 +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
Filip Gruszczynski
521ded6e9d am dbf8c0d9: am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev 
* commit 'dbf8c0d9260f83b0d4d60c1dea1fbcd023ee5d29':
  Don't perform layout while adjusting displays/stacks state.
 2015-09-02 00:06:38 +00:00
Eino-Ville Talvala
cb41a60ee2 am 7f2b4b6a: am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev 
* commit '7f2b4b6a63a6d2d6f7cbd6be9cc86d826fa99107':
  DO NOT MERGE: Fix DngCreator default crop calculations.
 2015-09-02 00:06:32 +00:00
Selim Cinek
260ae8e56c am 3e64c75f: am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 
* commit '3e64c75f33ef1f7876e1ae19fc1af4ff1e7ebdb6':
  Fixed when the notification effects are being cleared
 2015-09-02 00:06:24 +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
Filip Gruszczynski
dbf8c0d926 am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev 
* commit '991e493616a644b6bb7fdea9a99990520d77348a':
  Don't perform layout while adjusting displays/stacks state.
 2015-09-01 23:49:41 +00:00
Eino-Ville Talvala
7f2b4b6a63 am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev 
* commit '7e28b3bced7d6963114f667fc2ec0a13ff64607d':
  DO NOT MERGE: Fix DngCreator default crop calculations.
 2015-09-01 23:49:37 +00:00
Selim Cinek
3e64c75f33 am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 
* commit '146dc26511a9a1b82bf62d679b9cae6e8966241f':
  Fixed when the notification effects are being cleared
 2015-09-01 23:49:33 +00: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
Jim Miller
444f8d2d37 am d050cc87: am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev 
* commit 'd050cc87c865d0ea382132d5669668e7b806ac89':
  Fix broken enter key after failed PIN attempts.
 2015-09-01 23:32:43 +00:00
Vineeta Srivastava
971f899ab0 am 53c14ce4: am 860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev 
* commit '53c14ce4f1f4b85fa4c4418327353b92fa6b0499':
  Do not show roaming icon for NL KPN network with Telfort SIM
 2015-09-01 23:32:35 +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
Jim Miller
d050cc87c8 am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev 
* commit 'e45761ff901342a538607a3539997b106e867821':
  Fix broken enter key after failed PIN attempts.
 2015-09-01 23:08:06 +00:00
Vineeta Srivastava
53c14ce4f1 am 860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev 
* commit '860aa1e1b08ec119c5cc538cb2019ec53a72aeab':
  Do not show roaming icon for NL KPN network with Telfort SIM
 2015-09-01 23:08:03 +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
Svetoslav
42e3c3696d am dc436aaa: am 69228600: am fb9ec507: Incorrect app op check in broadcast queue 
* commit 'dc436aaaf2f00ddb0faf70ff6dfb8368c8a589f7':
  Incorrect app op check in broadcast queue
 2015-09-01 23:01:53 +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
dc436aaaf2 am 69228600: am fb9ec507: Incorrect app op check in broadcast queue 
* commit '692286008c197bb2810fcaf9441be5cb6a860ce0':
  Incorrect app op check in broadcast queue
 2015-09-01 22:52:09 +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
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
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
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