OSDN Git Service
dcashman [Wed, 8 Oct 2014 05:35:16 +0000 (05:35 +0000)]
am
43934324: am
224a46e9: am
90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
* commit '
439343246e551749b61e161134f832aef492c383':
Add mProperSigningKeySet to PackageKeySetData constructor.
dcashman [Wed, 8 Oct 2014 05:24:01 +0000 (05:24 +0000)]
am
224a46e9: am
90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
* commit '
224a46e98ffc8616ec631e12d7b0fef1e83ccd21':
Add mProperSigningKeySet to PackageKeySetData constructor.
dcashman [Wed, 8 Oct 2014 05:11:26 +0000 (05:11 +0000)]
am
90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
* commit '
90f46eca86df268d8df276fb68dac2e731f35479':
Add mProperSigningKeySet to PackageKeySetData constructor.
Wei Liu [Tue, 7 Oct 2014 23:06:45 +0000 (23:06 +0000)]
am
6bf67ef1: am
c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
* commit '
6bf67ef1ce029ad0932df647598c6fbfae375885':
Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
Wei Liu [Tue, 7 Oct 2014 23:02:17 +0000 (23:02 +0000)]
am
c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
* commit '
c7d477bb7d9d2391ad3d26bbe4718e7956597d20':
Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
Wei Liu [Tue, 7 Oct 2014 22:56:58 +0000 (22:56 +0000)]
Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
Svet Ganov [Tue, 7 Oct 2014 22:43:35 +0000 (22:43 +0000)]
am
40014e1d: Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
* commit '
40014e1db563946999dac2ded00345e6e92207eb':
Custom print settings cannot change resolution.
Svet Ganov [Tue, 7 Oct 2014 22:43:31 +0000 (22:43 +0000)]
am
c552800b: Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
* commit '
c552800b1f9923f343ad739d4835193c6cae892a':
Increase bind remote print spooler timeout for eng builds.
Quddus Chong [Tue, 7 Oct 2014 22:43:22 +0000 (22:43 +0000)]
am
61e6d40b: am
5b5bc109: am
6ec5a256: am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
61e6d40b0ca9111407015146472f040bad7ebfdf':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Ricardo Cervera [Tue, 7 Oct 2014 22:43:18 +0000 (22:43 +0000)]
am
b5018434: am
d047c0e0: am
c2b35efb: am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
b501843477170788d8514d5926f45a05b1a849c2':
docs: Training class for the Wearable UI Library
Rich Slogar [Tue, 7 Oct 2014 22:43:14 +0000 (22:43 +0000)]
am
1a61bc9c: am
15174523: am
d4303161: am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
1a61bc9cd1e51bb07776e311df90e7ff1d8fb22c':
docs:change required ADT version to 23.0.2
smain@google.com [Tue, 7 Oct 2014 22:43:11 +0000 (22:43 +0000)]
am
456a4e2d: am
cb8a81a8: am
a2561db3: am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
456a4e2d48cc4f81af11856d9db45e7ddeb84154':
make sdk download links use HTTPS bug:
8033954
Svet Ganov [Tue, 7 Oct 2014 22:42:06 +0000 (22:42 +0000)]
Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
Svet Ganov [Tue, 7 Oct 2014 22:41:19 +0000 (22:41 +0000)]
Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
Svet Ganov [Thu, 2 Oct 2014 01:06:56 +0000 (18:06 -0700)]
Increase bind remote print spooler timeout for eng builds.
bug:
17734729
Change-Id: I70bfe3b64fca24752cf3efc225b21d5453e53b68
Wei Liu [Mon, 6 Oct 2014 20:29:55 +0000 (13:29 -0700)]
Keep the BugreportWarningActivity screen on.
Make the bugreport warning text scrollable.
Bug:
16930717
Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
Quddus Chong [Tue, 7 Oct 2014 22:38:31 +0000 (22:38 +0000)]
am
5b5bc109: am
6ec5a256: am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
5b5bc1094edbaf861ac1e0c8155a2feaa5e27f6c':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Ricardo Cervera [Tue, 7 Oct 2014 22:38:26 +0000 (22:38 +0000)]
am
d047c0e0: am
c2b35efb: am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
d047c0e04a16965cbc5ea422470c419b945ca1b0':
docs: Training class for the Wearable UI Library
Rich Slogar [Tue, 7 Oct 2014 22:38:21 +0000 (22:38 +0000)]
am
15174523: am
d4303161: am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
151745231640ed021052bc0fff3c4ca17beddc96':
docs:change required ADT version to 23.0.2
smain@google.com [Tue, 7 Oct 2014 22:38:16 +0000 (22:38 +0000)]
am
cb8a81a8: am
a2561db3: am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
cb8a81a875d85410921f81da08e48e0ea96282e0':
make sdk download links use HTTPS bug:
8033954
dcashman [Tue, 7 Oct 2014 22:37:20 +0000 (22:37 +0000)]
Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
Quddus Chong [Tue, 7 Oct 2014 22:32:52 +0000 (22:32 +0000)]
am
6ec5a256: am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
6ec5a256d78579057e82691e4cc21ca6222e2b1f':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Ricardo Cervera [Tue, 7 Oct 2014 22:32:48 +0000 (22:32 +0000)]
am
c2b35efb: am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
c2b35efb58623b778d0feaf49cc00e5e8bc9eed4':
docs: Training class for the Wearable UI Library
Rich Slogar [Tue, 7 Oct 2014 22:32:39 +0000 (22:32 +0000)]
am
d4303161: am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
d4303161b106e57c5d73081d5a729d233d9ad792':
docs:change required ADT version to 23.0.2
Svet Ganov [Thu, 2 Oct 2014 00:49:16 +0000 (17:49 -0700)]
Custom print settings cannot change resolution.
bug:
17677133
Change-Id: Ib8a24101f12d431fe221c1e91711d93a6a517273
smain@google.com [Tue, 7 Oct 2014 22:32:31 +0000 (22:32 +0000)]
am
a2561db3: am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
a2561db3869fea0dfc193ae6b5fc2d09c40cb3eb':
make sdk download links use HTTPS bug:
8033954
Quddus Chong [Tue, 7 Oct 2014 22:23:40 +0000 (22:23 +0000)]
am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
4be6fdebdd386dc18159c5557db91936a62f42ab':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Ricardo Cervera [Tue, 7 Oct 2014 22:23:31 +0000 (22:23 +0000)]
am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
0e61e44ddf8c8abb774020cde90ec44d4ae43bc6':
docs: Training class for the Wearable UI Library
Rich Slogar [Tue, 7 Oct 2014 22:23:24 +0000 (22:23 +0000)]
am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
64460a2b6e0166d4c24b195f850e67265fb485f5':
docs:change required ADT version to 23.0.2
smain@google.com [Tue, 7 Oct 2014 22:23:04 +0000 (22:23 +0000)]
am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
8267ffccbe58ea348a53a0e6058bf902d6e8932a':
make sdk download links use HTTPS bug:
8033954
Alan Viverette [Tue, 7 Oct 2014 22:12:35 +0000 (22:12 +0000)]
am
0660042a: Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev
* commit '
0660042a26b99614e4bed88eb21ef7b46526d73b':
Mutate and apply theme if needed before caching themed drawables
Alan Viverette [Tue, 7 Oct 2014 22:09:48 +0000 (22:09 +0000)]
Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev
Alan Viverette [Tue, 7 Oct 2014 22:08:47 +0000 (15:08 -0700)]
Mutate and apply theme if needed before caching themed drawables
This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.
Also implements missing mutate() method on ClipDrawable.
BUG:
17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
Christopher Tate [Tue, 7 Oct 2014 22:03:26 +0000 (22:03 +0000)]
am
152893dd: am
93e5e859: am
ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
* commit '
152893dd66a8cdecab14595c20085a0f10917f21':
Accept any restored wallpaper
Christopher Tate [Tue, 7 Oct 2014 21:59:10 +0000 (21:59 +0000)]
am
93e5e859: am
ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
* commit '
93e5e859e3d2c0f4d4f47c90d370b38be4440655':
Accept any restored wallpaper
Christopher Tate [Tue, 7 Oct 2014 21:53:54 +0000 (21:53 +0000)]
am
ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
* commit '
ae456fd894c5a41f859196016a7c49113b235eda':
Accept any restored wallpaper
Christopher Tate [Tue, 7 Oct 2014 21:50:07 +0000 (21:50 +0000)]
Merge "Accept any restored wallpaper" into lmp-dev
dcashman [Tue, 7 Oct 2014 21:16:35 +0000 (14:16 -0700)]
Add mProperSigningKeySet to PackageKeySetData constructor.
Bug:
17847565
Change-Id: Iafa9650140e82d244d2336a07232bd40bf3c5eb8
Tyler Gunn [Tue, 7 Oct 2014 21:00:43 +0000 (21:00 +0000)]
am
663edb8b: am
329bd662: am
3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '
663edb8bfb5025b58ed874432b41f60cfa587266':
Fixing where call goes from disconnecting to active to disconnecting state.
Tyler Gunn [Tue, 7 Oct 2014 20:55:45 +0000 (20:55 +0000)]
am
329bd662: am
3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '
329bd662cc0dccaf41d441ea44db2895df48f0df':
Fixing where call goes from disconnecting to active to disconnecting state.
Tyler Gunn [Tue, 7 Oct 2014 20:51:51 +0000 (20:51 +0000)]
am
3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '
3bde32e68d201f2dda4a4847d2818c74b120cdbb':
Fixing where call goes from disconnecting to active to disconnecting state.
Tyler Gunn [Tue, 7 Oct 2014 20:46:38 +0000 (20:46 +0000)]
Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
Adam Lesinski [Tue, 7 Oct 2014 20:08:31 +0000 (20:08 +0000)]
am
18ab83e5: am
f189c445: am
1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
* commit '
18ab83e571e1ef7e4599d38cffc080dca704a06d':
Load shared library dependencies for AppWidgets
Jason Monk [Tue, 7 Oct 2014 20:08:27 +0000 (20:08 +0000)]
am
fc3487ce: am
000b85fa: am
733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '
fc3487ceddbcea9a28148a90a8e0ba5a4b76b08f':
Hide hotspot tile if 'provisioning' is needed
Andres Morales [Tue, 7 Oct 2014 20:08:24 +0000 (20:08 +0000)]
am
5d623881: am
4e558355: am
258d2221: Fix build, previous commit failed to remove an import
* commit '
5d6238819279572ab75c8caed08942160ebe7adb':
Fix build, previous commit failed to remove an import
Andres Morales [Tue, 7 Oct 2014 20:08:21 +0000 (20:08 +0000)]
am
6ef845d3: am
b4589115: am
d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
* commit '
6ef845d34ae2ac773c833084997ed93c3bf9dd8a':
Remove dead NFC unlock code from fw/base
Jorim Jaggi [Tue, 7 Oct 2014 20:08:17 +0000 (20:08 +0000)]
am
bc2af9fb: am
c4a7c191: am
988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '
bc2af9fbcf7f780c4824913b124af9da4f7a0380':
Update 'No notifications' text on configuration change
Adam Lesinski [Tue, 7 Oct 2014 20:03:24 +0000 (20:03 +0000)]
am
f189c445: am
1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
* commit '
f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
Load shared library dependencies for AppWidgets
Jason Monk [Tue, 7 Oct 2014 20:03:18 +0000 (20:03 +0000)]
am
000b85fa: am
733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '
000b85fa8ca68b530b18a7318f8ac49b76b1114f':
Hide hotspot tile if 'provisioning' is needed
Andres Morales [Tue, 7 Oct 2014 20:03:14 +0000 (20:03 +0000)]
am
4e558355: am
258d2221: Fix build, previous commit failed to remove an import
* commit '
4e5583554151ea95d8d573e3d64947afbc51f34f':
Fix build, previous commit failed to remove an import
Andres Morales [Tue, 7 Oct 2014 20:03:09 +0000 (20:03 +0000)]
am
b4589115: am
d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
* commit '
b4589115ad5ca8a98aa8f9b75296502658ae6416':
Remove dead NFC unlock code from fw/base
Jorim Jaggi [Tue, 7 Oct 2014 20:03:04 +0000 (20:03 +0000)]
am
c4a7c191: am
988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '
c4a7c191be3a6fcbff984aa8b54c6378cc94262d':
Update 'No notifications' text on configuration change
Adam Lesinski [Tue, 7 Oct 2014 19:58:59 +0000 (19:58 +0000)]
am
1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
* commit '
1a98dd5cc7ea89793208b51983198bfbeade5ccc':
Load shared library dependencies for AppWidgets
Jason Monk [Tue, 7 Oct 2014 19:58:48 +0000 (19:58 +0000)]
am
733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '
733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
Hide hotspot tile if 'provisioning' is needed
Andres Morales [Tue, 7 Oct 2014 19:58:41 +0000 (19:58 +0000)]
am
258d2221: Fix build, previous commit failed to remove an import
* commit '
258d222152a410341ddad045ce92e57dd7ab454e':
Fix build, previous commit failed to remove an import
Andres Morales [Tue, 7 Oct 2014 19:58:36 +0000 (19:58 +0000)]
am
d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
* commit '
d6a2ab930972d5578957ca919abd38fca074deec':
Remove dead NFC unlock code from fw/base
Jorim Jaggi [Tue, 7 Oct 2014 19:58:28 +0000 (19:58 +0000)]
am
988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '
988a8a9820bb3ae331be4932eb9e672a4614efd5':
Update 'No notifications' text on configuration change
Adam Lesinski [Tue, 7 Oct 2014 19:51:16 +0000 (19:51 +0000)]
Merge "Load shared library dependencies for AppWidgets" into lmp-dev
Adam Lesinski [Tue, 7 Oct 2014 19:14:45 +0000 (12:14 -0700)]
Load shared library dependencies for AppWidgets
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.
Bug:
17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
Jason Monk [Tue, 7 Oct 2014 18:53:20 +0000 (18:53 +0000)]
Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev
Jason Monk [Tue, 7 Oct 2014 18:22:59 +0000 (14:22 -0400)]
Hide hotspot tile if 'provisioning' is needed
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.
Bug:
17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
Andres Morales [Tue, 7 Oct 2014 18:14:21 +0000 (11:14 -0700)]
Fix build, previous commit failed to remove an import
Bug:
17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
Andres Morales [Tue, 7 Oct 2014 18:11:20 +0000 (18:11 +0000)]
Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
Amith Yamasani [Tue, 7 Oct 2014 17:55:24 +0000 (17:55 +0000)]
am
4797554a: am
b86671f4: am
41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '
4797554ab8522ffc3dbf6f4ede111dcbbb7bb757':
Set the default user restrictions to disallow calling and sms
John Spurlock [Tue, 7 Oct 2014 17:55:21 +0000 (17:55 +0000)]
am
97e9a034: am
2c52c443: am
0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '
97e9a034b99dfacf64dec38be608d7db24a31e9e':
Doze: Avoid pulsing in pockets.
Jean-Michel Trivi [Tue, 7 Oct 2014 17:55:17 +0000 (17:55 +0000)]
am
63b6d3ed: am
986468a8: am
dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
* commit '
63b6d3ed1d267101d1f37844ff855768c25dfa99':
Full volume on remote submix for apps that need it
PauloftheWest [Tue, 7 Oct 2014 17:55:14 +0000 (17:55 +0000)]
am
0c583078: am
f7b7b758: am
53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '
0c58307868a5a240a79cc7c77a6e5e4c61e68896':
Fixed a Bluetooth Quick Settings update bug.
Yorke Lee [Tue, 7 Oct 2014 17:55:11 +0000 (17:55 +0000)]
am
a64c5714: am
84e9479a: am
7f22eb98: Merge "Fix build break" into lmp-dev
* commit '
a64c571454b26a7c15d1b1667a35e2211caed345':
Fix build break
Jorim Jaggi [Tue, 7 Oct 2014 17:48:00 +0000 (17:48 +0000)]
Merge "Update 'No notifications' text on configuration change" into lmp-dev
Amith Yamasani [Tue, 7 Oct 2014 17:43:08 +0000 (17:43 +0000)]
am
b86671f4: am
41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '
b86671f4b8263affaa561796862bd4149235b1d3':
Set the default user restrictions to disallow calling and sms
John Spurlock [Tue, 7 Oct 2014 17:43:03 +0000 (17:43 +0000)]
am
2c52c443: am
0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '
2c52c443dcca748279e386160143ae388b19bb66':
Doze: Avoid pulsing in pockets.
Jean-Michel Trivi [Tue, 7 Oct 2014 17:42:58 +0000 (17:42 +0000)]
am
986468a8: am
dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
* commit '
986468a8ab77ce1e89247078d4e93a3aaa5d294b':
Full volume on remote submix for apps that need it
PauloftheWest [Tue, 7 Oct 2014 17:42:52 +0000 (17:42 +0000)]
am
f7b7b758: am
53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '
f7b7b7585acb0bec5c8ccfd646981a1b9f906f60':
Fixed a Bluetooth Quick Settings update bug.
Yorke Lee [Tue, 7 Oct 2014 17:42:48 +0000 (17:42 +0000)]
am
84e9479a: am
7f22eb98: Merge "Fix build break" into lmp-dev
* commit '
84e9479a09ce7dd9bb0a153ba75fe78554a0c114':
Fix build break
Amith Yamasani [Tue, 7 Oct 2014 17:33:25 +0000 (17:33 +0000)]
am
41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '
41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
Set the default user restrictions to disallow calling and sms
John Spurlock [Tue, 7 Oct 2014 17:33:10 +0000 (17:33 +0000)]
am
0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '
0d334365c6123388a0df81438b82122be29d19ab':
Doze: Avoid pulsing in pockets.
Jean-Michel Trivi [Tue, 7 Oct 2014 17:33:05 +0000 (17:33 +0000)]
am
dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
* commit '
dce7a427593c6e11277d9e3075ab027512923276':
Full volume on remote submix for apps that need it
PauloftheWest [Tue, 7 Oct 2014 17:31:39 +0000 (17:31 +0000)]
am
53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '
53c84002911362c913bc72cd28d186718a33149d':
Fixed a Bluetooth Quick Settings update bug.
Yorke Lee [Tue, 7 Oct 2014 17:31:19 +0000 (17:31 +0000)]
am
7f22eb98: Merge "Fix build break" into lmp-dev
* commit '
7f22eb981812309a1e751a891428dffe6b1da175':
Fix build break
Tyler Gunn [Tue, 7 Oct 2014 17:14:55 +0000 (10:14 -0700)]
Fixing where call goes from disconnecting to active to disconnecting state.
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).
Bug:
17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
Amith Yamasani [Tue, 7 Oct 2014 17:11:33 +0000 (17:11 +0000)]
Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
John Spurlock [Tue, 7 Oct 2014 16:17:45 +0000 (16:17 +0000)]
Merge "Doze: Avoid pulsing in pockets." into lmp-dev
Jean-Michel Trivi [Tue, 7 Oct 2014 16:12:07 +0000 (16:12 +0000)]
Merge "Full volume on remote submix for apps that need it" into lmp-dev
Jean-Michel Trivi [Thu, 2 Oct 2014 00:49:29 +0000 (17:49 -0700)]
Full volume on remote submix for apps that need it
If an AudioRecord is created with the "fixedVolume" tag
when recording from REMOTE_SUBMIX, treat the
device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
device during the recording. Also register a death
handler during the recording.
Otherwise this is a no-op.
Bug
17635294
Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
John Spurlock [Fri, 3 Oct 2014 21:12:40 +0000 (17:12 -0400)]
Doze: Avoid pulsing in pockets.
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.
Bug:
17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
PauloftheWest [Tue, 7 Oct 2014 13:01:26 +0000 (13:01 +0000)]
Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
Amit Mahajan [Tue, 7 Oct 2014 05:19:27 +0000 (05:19 +0000)]
am
dbbf4932: am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
dbbf493220ea6bb51016a4d6bb77b3b7133b1b4b':
Sms7BitEncodingTranslator
Amit Mahajan [Tue, 7 Oct 2014 05:12:44 +0000 (05:12 +0000)]
am
d9a3f89a: Merge commit \'
69555fc2\' into fix-merge-conflict3
* commit '
d9a3f89a0727590a069c563a8b97fe99b866d67c':
Sms7BitEncodingTranslator
Amit Mahajan [Tue, 7 Oct 2014 04:57:42 +0000 (21:57 -0700)]
Merge commit '
69555fc2' into fix-merge-conflict3
Conflicts:
core/res/res/values/symbols.xml
Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
Yorke Lee [Tue, 7 Oct 2014 03:56:34 +0000 (03:56 +0000)]
Yorke Lee [Tue, 7 Oct 2014 03:31:21 +0000 (03:31 +0000)]
am
770ed6ec: Fix build break
* commit '
770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
Fix build break
Yorke Lee [Tue, 7 Oct 2014 01:58:52 +0000 (18:58 -0700)]
Fix build break
Bug:
16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit
9858af0ec68ad28db60047587c8eb6232b4a6591)
Yorke Lee [Tue, 7 Oct 2014 02:12:01 +0000 (02:12 +0000)]
Merge "Fix build break" into lmp-dev
Yorke Lee [Tue, 7 Oct 2014 01:58:52 +0000 (18:58 -0700)]
Fix build break
Bug:
16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
Amith Yamasani [Mon, 6 Oct 2014 21:20:28 +0000 (14:20 -0700)]
Set the default user restrictions to disallow calling and sms
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.
Bug:
17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
Amit Mahajan [Tue, 7 Oct 2014 01:20:26 +0000 (01:20 +0000)]
Merge "Sms7BitEncodingTranslator" into lmp-dev
Yorke Lee [Tue, 7 Oct 2014 01:08:52 +0000 (01:08 +0000)]
am
0b27c283: am
7e552595: am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
0b27c283771e3690f47900d0c2130ae10af332a5':
Add ability to add sim-initiated MO call to UI (2/4)
Yorke Lee [Tue, 7 Oct 2014 01:04:30 +0000 (01:04 +0000)]
am
7e552595: am
4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '
7e552595bda0825787820e3d9bb58b5fad32cd01':
Add ability to add sim-initiated MO call to UI (2/4)
Xia Ying [Tue, 5 Aug 2014 21:37:18 +0000 (16:37 -0500)]
Sms7BitEncodingTranslator
Bug:
16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
Christopher Tate [Tue, 7 Oct 2014 01:00:51 +0000 (18:00 -0700)]
Accept any restored wallpaper
...and let the wallpaper service & hosts figure out what to do
with it.
Bug
17677006
Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
OSDN Git Service
