OSDN Git Service
Jeff Sharkey [Mon, 24 Mar 2014 17:38:48 +0000 (10:38 -0700)]
am
6640f6be: am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
6640f6be412e7454bfa7d457670e83aba46ea28c':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Mon, 24 Mar 2014 17:38:45 +0000 (10:38 -0700)]
am
02893315: am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
0289331500457837f8ec20eea42f7bbbc2c3f479':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:38:42 +0000 (10:38 -0700)]
am
125f2155: am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
125f2155bedf37841d7c9a9b59fb2680e41cfcef':
Make windowSwipeToDismiss a public attribute.
Jeff Sharkey [Mon, 24 Mar 2014 17:34:02 +0000 (17:34 +0000)]
am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
b8846c819e43535250b004dde593892fa305b7e7':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:58 +0000 (17:33 +0000)]
am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
d3e33cc25d638cced9c17822db21e6c32e00f461':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:55 +0000 (17:33 +0000)]
am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
e3d4f6c19bb21dd20d95446def9a8872ecab2721':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Mon, 24 Mar 2014 17:29:01 +0000 (10:29 -0700)]
am
70d78bbe: Make windowSwipeToDismiss a public attribute.
* commit '
70d78bbeecc491ebb0a30ee650d2445145992514':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Thu, 20 Mar 2014 23:31:48 +0000 (16:31 -0700)]
Make windowSwipeToDismiss a public attribute.
resolved conflicts for merge of
e3d4f6c1 to master
Bug:
13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
George Mount [Mon, 24 Mar 2014 16:51:55 +0000 (09:51 -0700)]
am
fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process."
* commit '
fea8d956649589f1cfd378571cc9ad61a92cd480':
Fix null ActivityOptions when starting an Activity in a new Process.
George Mount [Mon, 24 Mar 2014 16:51:52 +0000 (09:51 -0700)]
am
07e1b900: Merge "Fix problem on Animator with a start delay."
* commit '
07e1b9002a51032a7dc782178d3c29d3417ab266':
Fix problem on Animator with a start delay.
George Mount [Mon, 24 Mar 2014 16:47:08 +0000 (16:47 +0000)]
Merge "Fix null ActivityOptions when starting an Activity in a new Process."
George Mount [Mon, 24 Mar 2014 16:46:59 +0000 (16:46 +0000)]
Merge "Fix problem on Animator with a start delay."
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 12:28:44 +0000 (05:28 -0700)]
am
7638b1f3: Merge "Do not reset language in case of the TTS service reconnect."
* commit '
7638b1f3b56d8176e401a4067b18749682635f0c':
Do not reset language in case of the TTS service reconnect.
Mathew Inwood [Mon, 24 Mar 2014 12:28:40 +0000 (05:28 -0700)]
am
a73b0c54: Merge "Fix log spam from View.toString()."
* commit '
a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
Fix log spam from View.toString().
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 10:08:36 +0000 (10:08 +0000)]
Merge "Do not reset language in case of the TTS service reconnect."
Mathew Inwood [Mon, 24 Mar 2014 09:46:22 +0000 (09:46 +0000)]
Merge "Fix log spam from View.toString()."
Craig Mautner [Sun, 23 Mar 2014 01:24:22 +0000 (18:24 -0700)]
am
296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
* commit '
296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
Craig Mautner [Sun, 23 Mar 2014 01:20:41 +0000 (01:20 +0000)]
Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Sun, 23 Mar 2014 00:10:33 +0000 (00:10 +0000)]
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
This reverts commit
f7ad855718dc576a1618a54035b82e92356aa0d8.
After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.
Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
Craig Mautner [Sat, 22 Mar 2014 23:50:28 +0000 (16:50 -0700)]
am
61ada5d3: Merge "Add Activity methods for icons and labels."
* commit '
61ada5d330e10a738ba5f085cae5b9b339895d19':
Add Activity methods for icons and labels.
Craig Mautner [Sat, 22 Mar 2014 23:44:37 +0000 (23:44 +0000)]
Merge "Add Activity methods for icons and labels."
Craig Mautner [Fri, 21 Mar 2014 16:34:07 +0000 (09:34 -0700)]
Add Activity methods for icons and labels.
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.
Fixes bug
13562992.
Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
John Spurlock [Sat, 22 Mar 2014 01:40:38 +0000 (18:40 -0700)]
am
9ae0c8ff: Merge "Add notification category for recommendations."
* commit '
9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
Add notification category for recommendations.
John Spurlock [Sat, 22 Mar 2014 01:35:46 +0000 (01:35 +0000)]
Merge "Add notification category for recommendations."
John Spurlock [Fri, 21 Mar 2014 17:30:57 +0000 (13:30 -0400)]
Add notification category for recommendations.
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
Dianne Hackborn [Sat, 22 Mar 2014 00:30:55 +0000 (17:30 -0700)]
am
e9c9c441: Merge "Battery stats: track actually running time"
* commit '
e9c9c441346586e26eccc0523fcf12f5158e53f7':
Battery stats: track actually running time
Dianne Hackborn [Sat, 22 Mar 2014 00:26:19 +0000 (00:26 +0000)]
Merge "Battery stats: track actually running time"
Christopher Tate [Fri, 21 Mar 2014 23:37:06 +0000 (16:37 -0700)]
am
18a65ad0: Merge "Cap the size of app-defined permission trees"
* commit '
18a65ad09d9a245266874015e5aacb05d868a534':
Cap the size of app-defined permission trees
Christopher Tate [Fri, 21 Mar 2014 23:32:58 +0000 (23:32 +0000)]
Merge "Cap the size of app-defined permission trees"
George Mount [Thu, 20 Mar 2014 16:38:23 +0000 (09:38 -0700)]
Fix null ActivityOptions when starting an Activity in a new Process.
Bug
13563265
Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
Dianne Hackborn [Fri, 21 Mar 2014 18:07:11 +0000 (11:07 -0700)]
Battery stats: track actually running time
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.
Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.
Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.
Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
George Mount [Fri, 21 Mar 2014 23:13:37 +0000 (16:13 -0700)]
Fix problem on Animator with a start delay.
Bug
13589060
Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
Winson Chung [Fri, 21 Mar 2014 23:07:22 +0000 (16:07 -0700)]
am
e9c77aee: Merge "Fixing crash with multiple touch pointers"
* commit '
e9c77aee60fbb781db916d32fe1db81e1d973f8f':
Fixing crash with multiple touch pointers
Winson Chung [Fri, 21 Mar 2014 23:03:15 +0000 (23:03 +0000)]
Merge "Fixing crash with multiple touch pointers"
Winson Chung [Fri, 21 Mar 2014 22:15:11 +0000 (15:15 -0700)]
Fixing crash with multiple touch pointers
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug.
13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents
Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
Christopher Tate [Fri, 21 Mar 2014 22:16:14 +0000 (15:16 -0700)]
Cap the size of app-defined permission trees
Bug
13529742
Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
Matthew Williams [Fri, 21 Mar 2014 22:07:19 +0000 (15:07 -0700)]
am
cde7086b: Merge "Downgrade expedited to normal on reschedule."
* commit '
cde7086b900fd192a8e389f62ab5007d351d86b8':
Downgrade expedited to normal on reschedule.
Matthew Williams [Fri, 21 Mar 2014 21:59:07 +0000 (21:59 +0000)]
Merge "Downgrade expedited to normal on reschedule."
Paul Lawrence [Fri, 21 Mar 2014 20:45:20 +0000 (13:45 -0700)]
am
717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
* commit '
717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
Paul Lawrence [Fri, 21 Mar 2014 20:40:46 +0000 (20:40 +0000)]
Merge "Don't prompt at boot if we already did that when decrypting"
Jinsuk Kim [Fri, 21 Mar 2014 20:30:02 +0000 (13:30 -0700)]
Jinsuk Kim [Fri, 21 Mar 2014 20:23:45 +0000 (20:23 +0000)]
Colin Cross [Fri, 21 Mar 2014 20:23:05 +0000 (13:23 -0700)]
am
8a60ded0: Merge "resolved conflicts for merge of
a67e34c8 to master"
* commit '
8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
Colin Cross [Fri, 21 Mar 2014 20:19:54 +0000 (20:19 +0000)]
Merge "resolved conflicts for merge of
a67e34c8 to master"
Colin Cross [Fri, 21 Mar 2014 20:11:02 +0000 (13:11 -0700)]
resolved conflicts for merge of
a67e34c8 to master
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
Bo Liu [Fri, 21 Mar 2014 20:05:57 +0000 (13:05 -0700)]
am
caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
* commit '
caf947737d3e94d2f5d839ec1fa951df7937fdb2':
Convert a attach/detach functor in ViewRootImpl to x64
Bo Liu [Fri, 21 Mar 2014 20:00:34 +0000 (20:00 +0000)]
Merge "Convert a attach/detach functor in ViewRootImpl to x64"
Adam Cohen [Fri, 21 Mar 2014 20:00:08 +0000 (13:00 -0700)]
am
fb40d78c: Merge "Catch exceptions if Exif is malformed"
* commit '
fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
Adam Cohen [Fri, 21 Mar 2014 19:56:46 +0000 (12:56 -0700)]
am
146af201: Merge "Catching security exception when activity destroyed"
* commit '
146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
John Spurlock [Fri, 21 Mar 2014 19:56:43 +0000 (12:56 -0700)]
am
3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
* commit '
3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
Adam Cohen [Fri, 21 Mar 2014 19:55:53 +0000 (19:55 +0000)]
Merge "Catch exceptions if Exif is malformed"
Adam Cohen [Fri, 21 Mar 2014 19:54:54 +0000 (19:54 +0000)]
Merge "Catching security exception when activity destroyed"
John Spurlock [Fri, 21 Mar 2014 19:51:44 +0000 (19:51 +0000)]
Merge "Annotate framework vibrate calls with stream hints."
Selim Cinek [Fri, 21 Mar 2014 19:43:52 +0000 (12:43 -0700)]
am
a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
* commit '
a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 19:39:38 +0000 (19:39 +0000)]
Merge "Disable Set Wallpaper button while loading image"
Craig Mautner [Fri, 21 Mar 2014 19:32:38 +0000 (12:32 -0700)]
am
f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.
* commit '
f7ad855718dc576a1618a54035b82e92356aa0d8':
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
Selim Cinek [Fri, 21 Mar 2014 19:32:34 +0000 (20:32 +0100)]
Catch exceptions if Exif is malformed
Bug:
11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
Selim Cinek [Fri, 21 Mar 2014 19:24:55 +0000 (20:24 +0100)]
Catching security exception when activity destroyed
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.
Bug:
12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
Craig Mautner [Fri, 21 Mar 2014 19:24:07 +0000 (12:24 -0700)]
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.
Fixes bug
13558398.
Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
Chris Wren [Fri, 21 Mar 2014 19:14:10 +0000 (12:14 -0700)]
am
386fff99: Merge "lower the heads up threshold to exactly PRIORITY_HIGH"
* commit '
386fff993a205f551f4e3d6f8e31e0740365f727':
lower the heads up threshold to exactly PRIORITY_HIGH
Chris Wren [Fri, 21 Mar 2014 19:10:50 +0000 (19:10 +0000)]
Merge "lower the heads up threshold to exactly PRIORITY_HIGH"
Chris Wren [Fri, 21 Mar 2014 18:31:05 +0000 (14:31 -0400)]
lower the heads up threshold to exactly PRIORITY_HIGH
Bug:
13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
Bo Liu [Fri, 21 Mar 2014 19:06:23 +0000 (12:06 -0700)]
Convert a attach/detach functor in ViewRootImpl to x64
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
Fabrice Di Meglio [Fri, 21 Mar 2014 18:44:21 +0000 (11:44 -0700)]
am
7434fcec: Merge "Add support for enabled state for SearchIndexableData"
* commit '
7434fcec6928e9e570f7ab0bf033f04ca5a13ba1':
Add support for enabled state for SearchIndexableData
Fabrice Di Meglio [Fri, 21 Mar 2014 18:38:58 +0000 (18:38 +0000)]
Merge "Add support for enabled state for SearchIndexableData"
Fabrice Di Meglio [Fri, 21 Mar 2014 02:46:13 +0000 (19:46 -0700)]
Add support for enabled state for SearchIndexableData
- add "enabled" member which tells if the data will be
included into the search results.
Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
Mathew Inwood [Fri, 21 Mar 2014 18:25:36 +0000 (18:25 +0000)]
Fix log spam from View.toString().
If a view has a non-zero ID that is not defined in resources (i.e. has been
set pragmatically), the calls to Resources.getResourcePackageName() and
Resources.getResourceEntryName() result in a log warning:
No package identifier when getting name for resource number 0x00000001
Fix this by not attempting to resolve the package & name when there is
none.
Change-Id: Id88a61539fffb36187da7911f8e8a42d5a1bb951
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
Jeff Sharkey [Fri, 21 Mar 2014 18:06:44 +0000 (18:06 +0000)]
am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
cf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 18:06:41 +0000 (18:06 +0000)]
am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
aa0fa8eb08043e4c070c6c0db07678cf1f8f8a99':
Fix link in documentation for SWIPE_TO_DISMISS.
Jeff Sharkey [Fri, 21 Mar 2014 18:00:13 +0000 (18:00 +0000)]
am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
4868da52450d3e5456b3567c228967539144d108':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 18:00:09 +0000 (18:00 +0000)]
am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
cedbfad48753b4e266405f677cd0f13156d0c61d':
Fix link in documentation for SWIPE_TO_DISMISS.
Jeff Sharkey [Fri, 21 Mar 2014 17:56:44 +0000 (17:56 +0000)]
am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
c620ec3614c8737b87d60efa9db96c288bcad794':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 17:50:44 +0000 (10:50 -0700)]
Fix link in documentation for SWIPE_TO_DISMISS.
Change-Id: I3ff1fb1ae97b088e6b2e1a7a2c27981e7220cc2e
Jeff Sharkey [Fri, 21 Mar 2014 17:50:39 +0000 (17:50 +0000)]
am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
3f5232220f2db839f690489ed272113f660daa40':
Lock down MANAGE_DOCUMENTS permission.
Jeff Sharkey [Fri, 21 Mar 2014 17:47:00 +0000 (17:47 +0000)]
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
Will Haldean Brown [Fri, 21 Mar 2014 17:32:40 +0000 (17:32 +0000)]
am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
8f2c3252f155bf03206f879e0b89a0e32e3c6e7c':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Fri, 21 Mar 2014 17:26:15 +0000 (17:26 +0000)]
am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
496e8178b0e11c41678e1f2747a41cc2d8b2bda3':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Fri, 21 Mar 2014 17:22:34 +0000 (17:22 +0000)]
Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
Adam Lesinski [Fri, 21 Mar 2014 16:53:21 +0000 (09:53 -0700)]
am
ac6e97a5: Merge "Reduce warning verbosity in aapt"
* commit '
ac6e97a5a69738a1d32794fc76ca639201639501':
Reduce warning verbosity in aapt
Jean-Michel Trivi [Fri, 21 Mar 2014 16:53:18 +0000 (09:53 -0700)]
am
e10dd634: Merge "AudioTrack write from ByteBuffer updates position"
* commit '
e10dd634e169ae628455a3dc49638ffde3583a80':
AudioTrack write from ByteBuffer updates position
Adam Lesinski [Fri, 21 Mar 2014 16:51:12 +0000 (16:51 +0000)]
Merge "Reduce warning verbosity in aapt"
Jean-Michel Trivi [Fri, 21 Mar 2014 16:49:55 +0000 (16:49 +0000)]
Merge "AudioTrack write from ByteBuffer updates position"
Jean-Michel Trivi [Fri, 21 Mar 2014 00:02:31 +0000 (17:02 -0700)]
AudioTrack write from ByteBuffer updates position
Remove offset parameter.
Update buffer position when data is successfully written.
Bug
7919023
Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
John Spurlock [Fri, 21 Mar 2014 14:31:28 +0000 (07:31 -0700)]
am
824ad0e6: Merge "Unhide notification category."
* commit '
824ad0e6f9c799f5b0faa2024e35fc6e714a681a':
Unhide notification category.
John Spurlock [Fri, 21 Mar 2014 14:26:55 +0000 (14:26 +0000)]
Merge "Unhide notification category."
John Spurlock [Tue, 18 Mar 2014 20:41:57 +0000 (16:41 -0400)]
Unhide notification category.
Rename @hidden Notification.kind -> category, and flesh out
shared values. Now a single value.
Update framework references, remove unused SystemUpdateService
magic value unused since 2012.
Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
John Spurlock [Thu, 20 Mar 2014 02:09:06 +0000 (22:09 -0400)]
Annotate framework vibrate calls with stream hints.
Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint. This prevents
them from being blocked by rules targeting the unspecified stream.
For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.
Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
Przemyslaw Szczepaniak [Fri, 21 Mar 2014 11:21:07 +0000 (11:21 +0000)]
Do not reset language in case of the TTS service reconnect.
Bug:
12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c
Jinsuk Kim [Fri, 21 Mar 2014 03:44:11 +0000 (03:44 +0000)]
am
cfba284a: am
d73e66cc: Fix broken build
* commit '
cfba284ad72b6ac3d7189f7c87cddb7299da7617':
Fix broken build
Jinsuk Kim [Fri, 21 Mar 2014 03:40:08 +0000 (03:40 +0000)]
am
d73e66cc: Fix broken build
* commit '
d73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
Fix broken build
Jinsuk Kim [Fri, 21 Mar 2014 02:57:09 +0000 (11:57 +0900)]
Fix broken build
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
Mike Lockwood [Fri, 21 Mar 2014 03:14:15 +0000 (20:14 -0700)]
am
0416faa2: am
7a07f4d4: am
a5853b17: am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
0416faa2b2b14df2f9392937a61f2d182feaa9d5':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 03:14:12 +0000 (20:14 -0700)]
am
c84b4d7f: am
e920322f: am
86119603: am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
c84b4d7ff20c21aa3658c81c18546a74921be441':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Wei Wang [Fri, 21 Mar 2014 03:14:09 +0000 (20:14 -0700)]
am
6890727c: am
3b6689c0: (-s ours) am
e781efd6: am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
6890727c0dca223254a5b1edf18b11061fde67fa':
Fix stopBatchedScan not working for wifi
Mike Lockwood [Fri, 21 Mar 2014 03:10:34 +0000 (03:10 +0000)]
am
7a07f4d4: am
a5853b17: am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
7a07f4d4ad1f2f4893223693aece62f095ce004e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 03:10:30 +0000 (03:10 +0000)]
am
e920322f: am
86119603: am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
e920322ff0c67cdd9e9682fd7c7df5221a6fb13e':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Wei Wang [Fri, 21 Mar 2014 03:10:24 +0000 (03:10 +0000)]
am
3b6689c0: (-s ours) am
e781efd6: am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
3b6689c010edd2deaf112f4d4239deeb2a244ea5':
Fix stopBatchedScan not working for wifi
Jinsuk Kim [Fri, 21 Mar 2014 02:41:43 +0000 (02:41 +0000)]
am
f2fecf48: am
c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit '
f2fecf48f740a079cf9015ea8c2695039ca11d81':
Add HDMI-CEC service
Jinsuk Kim [Fri, 21 Mar 2014 02:37:00 +0000 (02:37 +0000)]
am
c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit '
c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service