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

11055 Commits

Author SHA1 Message Date
Vineeta Srivastava
a42d17c523 am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '3cc41b8edd70244442ac666f3e3a2e63cff3cf0d':
  Show one name if both plmn and spn are equal
 2014-10-01 17:02:07 +00:00
Paul Jensen
8c4ba7c3f6 am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '18434fcc99e15f4cb29e4b07d4b1d7ba14b8285f':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 17:00:24 +00:00
Winson Chung
ac5bb347cb am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9 am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
 2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217 am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:00:05 +00:00
John Spurlock
abc4db312a am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit '3fd4440fea2d29f423a99cfaa5e30f4ff5c2239d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 16:59:44 +00:00
Baligh Uddin
f13bb6f53c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 16:35:21 +00:00
Vineeta Srivastava
3cc41b8edd am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
 2014-10-01 15:15:51 +00:00
Paul Jensen
18434fcc99 am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit 'a524b0f7869c7dc9b5687721883acfd9a535e440':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 15:14:45 +00:00
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +00:00
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +00:00
Vineeta Srivastava
533c946156 am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit 'ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
  Show one name if both plmn and spn are equal
 2014-10-01 15:02:37 +00:00
Paul Jensen
a524b0f786 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 14:59:47 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Sungmin Choi
ab1b39f434 Show one name if both plmn and spn are equal 
If both plmn and SPN are SKTelecom, lockscreen is shown as SKTelecom-SKTelecom.
In this case, it would be better to show only SKTelecom.

Bug: 17702041
Change-Id: I268455b037752cf21a3247be7809283f50b72c27
 2014-09-30 23:35:14 +00:00
Paul Jensen
8df099df15 Make CaptivePortalLogin app exit if underlying Network disconnects. 
The app is no longer useful if the underlying Network has disconnected
and could get in the way of another signing into another Network.

bug:17672087
Change-Id: I26e820444640975e7fd4dd73244f4d4f4b40cb5e
 2014-09-30 14:34:04 -04:00
Winson Chung
e3206407a5 Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9 Merge "Don't play hint animations when dozing" into lmp-dev 2014-09-30 16:35:26 +00:00
Jorim Jaggi
d7912d2f10 Don't play hint animations when dozing 
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
 2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab Merge "Pull roaming from mServiceState for consistency" into lmp-dev 2014-09-30 15:30:11 +00:00
John Spurlock
ee98df79a1 Doze: Log screenOnFromTouch when flinging. 
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
 2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4 Pull roaming from mServiceState for consistency 
Also consolidate roaming logic while here, to make it easier to
maintain.

Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
 2014-09-30 10:05:46 -04:00
Baligh Uddin
415c64b60d Import translations. DO NOT MERGE 
Change-Id: Ibf7c0b27ceae6f07a7f0e38e0fae2e83d218051c
Auto-generated-cl: translation import
 2014-09-30 04:05:35 -07:00
Jorim Jaggi
4fda564456 am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 
* commit '88126aa1707e38af0b70cb8b9752917f9589cb88':
  Revert "Add massive logging to investigate blank Keyguard"
 2014-09-29 21:03:02 +00:00
John Spurlock
d990706b03 am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 
* commit '0bea72864e1129ef559744ab00e74b6215ef246c':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
 2014-09-29 21:01:50 +00:00
Jorim Jaggi
c0350c7c00 am 5b002995: am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev 
* commit '5b002995ad5bda15fc7456228789b6b94ae2522c':
  Add option to enable scrim SRC optimization
 2014-09-29 21:01:30 +00:00
Jorim Jaggi
b0c3726a3b am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev 
* commit '697ace4edd1f1bf28dd0c058f53ad7af5858f2c8':
  Fix overdraw
 2014-09-29 21:01:22 +00:00
Selim Cinek
f2a6160b92 am 6b44ae6e: am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView 
* commit '6b44ae6e921ec6030274b96e88c6e5746c74d6c2':
  Fixed a crash that could occur in the ObservableScrollView
 2014-09-29 21:01:15 +00:00
Jorim Jaggi
88126aa170 am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
  Revert "Add massive logging to investigate blank Keyguard"
 2014-09-29 20:49:08 +00:00
John Spurlock
0bea72864e am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
 2014-09-29 20:48:15 +00:00
Jorim Jaggi
5b002995ad am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev 
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
  Add option to enable scrim SRC optimization
 2014-09-29 20:47:53 +00:00
Jorim Jaggi
697ace4edd am e2ff1a4e: Merge "Fix overdraw" into lmp-dev 
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
  Fix overdraw
 2014-09-29 20:47:46 +00:00
Selim Cinek
6b44ae6e92 am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView 
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
  Fixed a crash that could occur in the ObservableScrollView
 2014-09-29 20:47:39 +00:00
Winson Chung
8bf05afc26 Fixing crash in Recents due to late onBootCompleted call (Bug 17572254) 
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
 2014-09-29 13:42:49 -07:00
Jorim Jaggi
b514013083 Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 2014-09-29 16:31:55 +00:00
Baligh Uddin
e98a55e87e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:10 +00:00
Baligh Uddin
6744422b75 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:09 +00:00
Baligh Uddin
3796031264 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:03 +00:00
Baligh Uddin
5ce474d71e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
04678abbe5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
b09aabfd5f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:54 +00:00
John Spurlock
e5238f7a8d Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 2014-09-29 16:28:52 +00:00
John Spurlock
bee3b0a023 DozeLog: Keep keyguard monitor alive, keep emer call stats. 
Ensure the existing keyguard callback survives weak reference
collection, and add missing emergency call stats append.

Bug:17496795
Change-Id: Iecec4646562cf1f6edb5bc5972767127f4419035
 2014-09-29 11:30:12 -04:00
Jorim Jaggi
8a63806a8d Revert "Add massive logging to investigate blank Keyguard" 
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.

Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
 2014-09-29 16:24:55 +02:00
Jorim Jaggi
79107083ca Merge "Add option to enable scrim SRC optimization" into lmp-dev 2014-09-29 13:44:07 +00:00