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

204615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kilbourn
573cdc420b am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 
* commit '38ae119688f94d68c42d8d29958038e37bb74915':
  Allow shell to disable keyguard when not secure
 2015-09-02 17:59:51 +00:00
Tim Kilbourn
38ae119688 am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 
* commit '7cd6aaafda35509607e945fcadc4a556f75ed23b':
  Allow shell to disable keyguard when not secure
 2015-09-02 17:48:28 +00: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
9b126882e6 am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '01232c508e3d28c9c4cac08778c9d80d8d2395de':
  Fix Custom action mode menu item onclick is not working
 2015-09-02 10:20:06 +00:00
Clara Bayarri
01232c508e am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '582b186cd3b41c5c67649ae2ba9176c3860ab1ec':
  Fix Custom action mode menu item onclick is not working
 2015-09-02 10:10:47 +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
9051eab5a0 am 9edfb36a: am dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev 
* commit '9edfb36a4bf00f924050ad592dbcecbac3a4cf62':
  set config_use_sim_language_file false for KR LGU+/KT
 2015-09-02 07:47:36 +00:00
Joshua Schwarz
bade9522cf am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev 
* commit '258a7cd95e247a01d7dbb02b8858db6aa90ce621':
  Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
 2015-09-02 07:41:52 +00:00
Vineeta Srivastava
9edfb36a4b am dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev 
* commit 'dd124802a7220a813aeb5afe1b1d6ef1cb7277e2':
  set config_use_sim_language_file false for KR LGU+/KT
 2015-09-02 07:39:09 +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
Joshua Schwarz
258a7cd95e Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev 2015-09-02 07:27:39 +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
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
Joshua Schwarz
12fa3d1909 Use LOCAL_MAC_ADDRESS permission in bluetoothtests. 
Change-Id: If2b0797a4bc526e1fdb058d83d4d2bc676875cee
 2015-09-01 18:03:18 -07: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