Wink Saville
5f7da67781
am 3a9bab72: Change TelephonyRegistry to use phoneId as a callback condition.
...
* commit '3a9bab72d04f4b87d12ea1cb22c46d4adf2cb6bf':
Change TelephonyRegistry to use phoneId as a callback condition.
2014-07-27 02:04:06 +00:00
Wink Saville
e380b98667
Change TelephonyRegistry to use phoneId as a callback condition.
...
Previously subId was used but it is currently not consistent and
can take on dummy values thus callbacks would not be called appropriately.
Eventually I hope to remove the dummy value concept but for now this
looks like the best approach.
Bug: 16148026
Bug: 15973975
Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4
2014-07-26 18:24:22 -07:00
Wink Saville
41ea01ff24
am f46fca60: am 2337a859: am cb2871b3: Fix hasService and use it in updateTelephonySignalStrength.
...
* commit 'f46fca60eb31fc8318c8f5571d93cf090f63a63f':
Fix hasService and use it in updateTelephonySignalStrength.
2014-07-27 00:57:25 +00:00
Wink Saville
c192e95573
am 2337a859: am cb2871b3: Fix hasService and use it in updateTelephonySignalStrength.
...
* commit '2337a8594ab5ae79d17e7d06c26acba51ed33ae0':
Fix hasService and use it in updateTelephonySignalStrength.
2014-07-27 00:53:12 +00:00
Wink Saville
22a2419c7c
am cb2871b3: Fix hasService and use it in updateTelephonySignalStrength.
...
* commit 'cb2871b3d215dba73042c8730e69c5ad873ff755':
Fix hasService and use it in updateTelephonySignalStrength.
2014-07-27 00:50:19 +00:00
Wink Saville
d32e1b42c4
Fix hasService and use it in updateTelephonySignalStrength.
...
I introduced the bug in hasService in
change Ia463997eac7b062653b3cef00570d3fffc115ad3 which added
debug and a quick and dirty hack for 16148026.
Change-Id: I9d5fa36a8cdab2ca28487a94a9f2ecd0d0af6a4b
2014-07-27 00:46:59 +00:00
Jeff Brown
2da6665002
am 8bfbd2f6: am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev
...
* commit '8bfbd2f61ffb8cc9e167b45ae0306f05af54d10d':
Remove DozeHardware since it will not be used.
2014-07-26 22:56:17 +00:00
Jeff Brown
8090ac3eaa
am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev
...
* commit '7798e9313106abfcc39808108b35edc2493ebc6a':
Remove DozeHardware since it will not be used.
2014-07-26 22:52:04 +00:00
Jeff Brown
981838a45d
am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev
...
* commit '108f9dc260c703544054c44aa32048ff8556a7e0':
Remove DozeHardware since it will not be used.
2014-07-26 22:48:23 +00:00
John Spurlock
fa8fccf6c7
am 382300fd: am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev
...
* commit '382300fd23cda23040c97f2255edb5d6d351b019':
Doze: Update tease signal to buzz-beep-blink from NoMan.
2014-07-26 21:28:12 +00:00
John Spurlock
aa2a40d57b
am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev
...
* commit '8ebe80a3919861e36988f91ef95be2efb4e5836d':
Doze: Update tease signal to buzz-beep-blink from NoMan.
2014-07-26 21:24:44 +00:00
John Spurlock
b4f457d4ed
am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev
...
* commit 'c9dfaff71e485b67f181a3fcec0fed4df964a92f':
Doze: Update tease signal to buzz-beep-blink from NoMan.
2014-07-26 21:20:26 +00:00
Jorim Jaggi
09f7739e0f
am 1e3f2731: am fa6ff9da: am 07d1e212: Use finger velocity for ExpandHelper
...
* commit '1e3f27312c0f2992edd5c69e3d2f23a55ea9f15a':
Use finger velocity for ExpandHelper
2014-07-26 17:29:40 +00:00
Jorim Jaggi
65ed38c9ce
am fa6ff9da: am 07d1e212: Use finger velocity for ExpandHelper
...
* commit 'fa6ff9da595610fc2d9b1479ef39bc9aa3592be7':
Use finger velocity for ExpandHelper
2014-07-26 17:25:49 +00:00
Jorim Jaggi
00c9cb0930
am 07d1e212: Use finger velocity for ExpandHelper
...
* commit '07d1e2123eda201b1baf2c34b5fc4d270f0c706e':
Use finger velocity for ExpandHelper
2014-07-26 17:21:48 +00:00
Jorim Jaggi
28c0b714ac
Use finger velocity for ExpandHelper
...
Makes sure that the animation continuing the expand has the exact
same velocity as the finger started the expand. At the end of the
animation, the velocity slows nicely down (reusing logic from
FlingAnimationUtils, yay!).
Change-Id: If9a286a1a3d1bde649cf0475367a63a2188ca3c0
2014-07-26 17:16:39 +00:00
Jeff Brown
cd26a6a072
am ff415ca8: am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
...
* commit 'ff415ca830964a86399df19968dd2bceff275359':
Fix a deadlock due to AMS calling into WMS with its lock held.
2014-07-26 02:43:59 +00:00
Lajos Molnar
bc55237f1f
am 7358b32c: am 5ba94a4d: am 88a08631: Merge "Implement MediaCodec.getImage methods" into lmp-dev
...
* commit '7358b32c7459bb9b263b162f17250f12cc7b512c':
Implement MediaCodec.getImage methods
2014-07-26 02:43:55 +00:00
Jeff Brown
baacadd14d
am c1d00de0: am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev
...
* commit 'c1d00de01b5904a6c6e3e5b6160b0b7e628bd880':
Don't suppress haptic feedback on keyguard anymore.
2014-07-26 02:43:51 +00:00
Jeff Brown
402e888ecb
am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
...
* commit 'd2d80f2e401a06564cb03b649582f74c41e1337b':
Fix a deadlock due to AMS calling into WMS with its lock held.
2014-07-26 02:40:30 +00:00
Lajos Molnar
a8cc3074cd
am 5ba94a4d: am 88a08631: Merge "Implement MediaCodec.getImage methods" into lmp-dev
...
* commit '5ba94a4d490f01925f65b847998f05b17de8fc74':
Implement MediaCodec.getImage methods
2014-07-26 02:40:26 +00:00
Jeff Brown
fe841f1c63
am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev
...
* commit '32019e7e463565977bd29715e4a9e357c61d8a29':
Don't suppress haptic feedback on keyguard anymore.
2014-07-26 02:40:22 +00:00
Jeff Brown
61bf88f676
am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
...
* commit '8944771f51cd39867594a26b31d1ade5c5117e75':
Fix a deadlock due to AMS calling into WMS with its lock held.
2014-07-26 02:36:39 +00:00
Lajos Molnar
16efefce5c
am 88a08631: Merge "Implement MediaCodec.getImage methods" into lmp-dev
...
* commit '88a08631614beb652f48e2d24a778c4232f5719a':
Implement MediaCodec.getImage methods
2014-07-26 02:36:35 +00:00
Jeff Brown
c87382a860
am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev
...
* commit 'dab2b29b35d1b520dc7a45196d1eec2cf71f4d41':
Don't suppress haptic feedback on keyguard anymore.
2014-07-26 02:36:31 +00:00
Ji-Hwan Lee
3d24f17e9d
am 7ea51115: am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()
...
* commit '7ea51115e98550cc9119187f02daa1a98ae9cd42':
TIF: Fix invalid use of serviceStateMap.get()
2014-07-26 02:07:39 +00:00
Ji-Hwan Lee
6469c41f09
am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()
...
* commit 'e4160d70c64632bcb4394ff94b67f13738e63072':
TIF: Fix invalid use of serviceStateMap.get()
2014-07-26 02:04:24 +00:00
Ji-Hwan Lee
49a5cb2e1e
am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()
...
* commit '9c5d5ad9ce29668cc867545a203a146930788009':
TIF: Fix invalid use of serviceStateMap.get()
2014-07-26 01:59:26 +00:00
Amith Yamasani
da466e1e91
am 8a8c5f4d: am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen
...
* commit '8a8c5f4d305d0dad0f051af32914b07012bfc6a4':
Hidden global setting to allow adding users from lockscreen
2014-07-26 01:11:09 +00:00
Alan Viverette
b49f099611
am c5697654: am 2720d7ba: am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev
...
* commit 'c5697654cdaa433b3eddfa032cee4f2b6c77d97e':
Add public attribute for window clipToOutline
2014-07-26 01:11:04 +00:00
Zhijun He
79a53de48c
am 996db1f2: am c877e92e: am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
...
* commit '996db1f2f20c5375c1675c2d07249b7a83728fe5':
CamcorderProfiles: add high speed profile constants
2014-07-26 01:10:51 +00:00
Amith Yamasani
a9cfdf91e8
am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen
...
* commit '7ef87d4de0975ed682c50e5c14f7e58c1ce9622a':
Hidden global setting to allow adding users from lockscreen
2014-07-26 01:06:32 +00:00
Alan Viverette
3464253289
am 2720d7ba: am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev
...
* commit '2720d7ba734d44206679e6277a6b5d59e1560996':
Add public attribute for window clipToOutline
2014-07-26 01:06:28 +00:00
Zhijun He
ed53458f83
am c877e92e: am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
...
* commit 'c877e92e77ffdd7da2d2025cd625640e42dd2f16':
CamcorderProfiles: add high speed profile constants
2014-07-26 01:06:24 +00:00
Ruben Brunk
1032332cef
Merge "camera2: Add noiseModel when saving DNG tag."
2014-07-26 01:02:19 +00:00
Amith Yamasani
b9cc0d59ec
am 0a4e461e: Hidden global setting to allow adding users from lockscreen
...
* commit '0a4e461eaa30a10dabb44d4eb1c8b48bbce6226c':
Hidden global setting to allow adding users from lockscreen
2014-07-26 01:02:08 +00:00
Alan Viverette
5a8b4719be
am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev
...
* commit '77b2010c1f391f0ab3432da50154053b16a905c4':
Add public attribute for window clipToOutline
2014-07-26 01:02:04 +00:00
Zhijun He
ce8e748c9a
am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
...
* commit 'b52d22ce57b6b99fe0d98424d80adf43610dba2a':
CamcorderProfiles: add high speed profile constants
2014-07-26 01:01:56 +00:00
Fabrice Di Meglio
0ff94a67e4
am 1d1771ac: am 33211ef5: am 9ace30d1: Fix permission icons size to 24dp
...
* commit '1d1771acbe1563f1f0cd1a9458d8f1e550a2f361':
Fix permission icons size to 24dp
2014-07-26 00:50:25 +00:00
Fabrice Di Meglio
27b04be43a
am 33211ef5: am 9ace30d1: Fix permission icons size to 24dp
...
* commit '33211ef595057e973147f2804cc6694839ae87ac':
Fix permission icons size to 24dp
2014-07-26 00:45:53 +00:00
Fabrice Di Meglio
180d97f038
am 9ace30d1: Fix permission icons size to 24dp
...
* commit '9ace30d120b91db286a1c2319fe4ef212e2fbbf2':
Fix permission icons size to 24dp
2014-07-26 00:42:33 +00:00
Sandeep Siddhartha
0e2594b37c
am 4c96adaa: am 678883cc: am 5940eb3a: Fix various bugs with model management
...
* commit '4c96adaa1ec3c225fc7e57078787d88709456914':
Fix various bugs with model management
2014-07-26 00:30:25 +00:00
Sandeep Siddhartha
62f76f45fe
am 678883cc: am 5940eb3a: Fix various bugs with model management
...
* commit '678883cc235ea0a69be96ff988b26d0c92203022':
Fix various bugs with model management
2014-07-26 00:26:53 +00:00
Sandeep Siddhartha
6be9283e74
am 5940eb3a: Fix various bugs with model management
...
* commit '5940eb3a7cb88fb47c962326a7d3d80d01b810bd':
Fix various bugs with model management
2014-07-26 00:22:27 +00:00
Sandeep Siddhartha
eb3cbfeb48
am bac00601: am dc69e6e8: am be52f0d1: Add read/writeBlob to Parcel
...
* commit 'bac0060104d359bcc2d745082546c58828bec972':
Add read/writeBlob to Parcel
2014-07-26 00:20:40 +00:00
Sandeep Siddhartha
a60fd1939d
am dc69e6e8: am be52f0d1: Add read/writeBlob to Parcel
...
* commit 'dc69e6e80760805802c52bede94f182989e4229c':
Add read/writeBlob to Parcel
2014-07-26 00:16:41 +00:00
Sandeep Siddhartha
7c038097b5
am be52f0d1: Add read/writeBlob to Parcel
...
* commit 'be52f0d1d99fe34f912e089b27c4d0730d93356e':
Add read/writeBlob to Parcel
2014-07-26 00:12:41 +00:00
Jay Civelli
1bc15c5800
am ffddc0a2: (-s ours) am 30df0921: am 714f4cc4: Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
...
* commit 'ffddc0a22fb4e9b36e2ebc7d616b2789eb013402':
Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
2014-07-25 23:54:48 +00:00
Jay Civelli
aec415e870
am 30df0921: am 714f4cc4: Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
...
* commit '30df0921d4bd6882696ac04a15e580b131aa92cf':
Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
2014-07-25 23:50:42 +00:00
Jay Civelli
9f0246e261
am 714f4cc4: Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
...
* commit '714f4cc47db1b8428c74d20271826eea6fb924e0':
Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
2014-07-25 23:45:25 +00:00