OSDN Git Service
Zheng Fu [Fri, 30 Jan 2015 21:16:48 +0000 (21:16 +0000)]
Merge "Add backup_id column to raw_contacts, and hash_id column to data"
Elliott Hughes [Fri, 30 Jan 2015 19:32:21 +0000 (19:32 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Jason Monk [Fri, 30 Jan 2015 19:32:01 +0000 (19:32 +0000)]
am
b5083a7d: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge:
b2dd5cb automerge:
d2f15ec
* commit '
b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 19:30:56 +0000 (19:30 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge:
b2dd5cb automerge:
d2f15ec
automerge:
b5083a7
* commit '
b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 19:29:31 +0000 (19:29 +0000)]
Fix expandSettingsPanel status bar call automerge:
3c68ca2 automerge:
f388249
automerge:
734219d
* commit '
734219d9c22cbab2549d1d43d077e9e8e089730c':
Fix expandSettingsPanel status bar call
Jason Monk [Fri, 30 Jan 2015 19:27:06 +0000 (19:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge:
b2dd5cb
automerge:
d2f15ec
* commit '
d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 19:25:20 +0000 (19:25 +0000)]
Fix expandSettingsPanel status bar call automerge:
3c68ca2
automerge:
f388249
* commit '
f38824928cf586124ffc6dc7a85c7f8603f77c5a':
Fix expandSettingsPanel status bar call
Fyodor Kupolov [Fri, 30 Jan 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Removed userHandle from setXXX methods"
RoboErik [Fri, 30 Jan 2015 18:55:08 +0000 (18:55 +0000)]
Merge "Move mute/unmute handling to adjust volume paths"
Alan Viverette [Fri, 30 Jan 2015 18:53:12 +0000 (18:53 +0000)]
Merge "Add accessors for switch thumb and track tinting"
Chris Craik [Fri, 30 Jan 2015 18:53:00 +0000 (18:53 +0000)]
Merge "Refactor blending and texture gl state"
Chris Craik [Thu, 29 Jan 2015 17:45:09 +0000 (09:45 -0800)]
Refactor blending and texture gl state
Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a
Jason Monk [Fri, 30 Jan 2015 18:48:15 +0000 (18:48 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
automerge:
b2dd5cb
* commit '
b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 18:46:31 +0000 (18:46 +0000)]
Fix expandSettingsPanel status bar call
automerge:
3c68ca2
* commit '
3c68ca2feab6d3cd09c297ddc2e77af67694feec':
Fix expandSettingsPanel status bar call
Winson Chung [Fri, 30 Jan 2015 18:43:18 +0000 (18:43 +0000)]
Merge "Adding some debug controls to test multi-window."
Mike Lockwood [Fri, 30 Jan 2015 18:33:01 +0000 (18:33 +0000)]
Merge "MidiManager: minor Javadoc tweaks"
Jason Monk [Fri, 30 Jan 2015 18:27:52 +0000 (18:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Derek Sollenberger [Fri, 30 Jan 2015 18:23:00 +0000 (18:23 +0000)]
Merge "Create proxy between Skia's SkCanvas and the framework Canvas."
Mike Lockwood [Fri, 30 Jan 2015 18:19:48 +0000 (18:19 +0000)]
Merge "MidiManager: fix output port close"
Chris Craik [Fri, 30 Jan 2015 18:15:06 +0000 (18:15 +0000)]
Merge "Fix double create of Caches"
Mike Lockwood [Fri, 30 Jan 2015 18:14:23 +0000 (10:14 -0800)]
MidiManager: minor Javadoc tweaks
Change-Id: I8b8f93907b2f456267dee153122d46c6b6e25b80
Alan Viverette [Thu, 29 Jan 2015 22:27:49 +0000 (14:27 -0800)]
Add accessors for switch thumb and track tinting
Bug:
19196145
Change-Id: I5c426bc8c624c75fd27faaf6e0cbef5a0594175a
Alan Viverette [Fri, 30 Jan 2015 18:04:46 +0000 (18:04 +0000)]
Merge "Add transition support to PopupWindow"
Jason Monk [Fri, 30 Jan 2015 18:02:27 +0000 (13:02 -0500)]
Fix QS bluetooth tile accessibility issue
Bluetooth tile was not announcing its state when the top half was
clicked. This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information. So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.
Bug:
19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
Todd Kennedy [Fri, 30 Jan 2015 17:59:18 +0000 (17:59 +0000)]
Merge "Don't get extras from the Intent"
Derek Sollenberger [Tue, 16 Dec 2014 13:37:20 +0000 (08:37 -0500)]
Create proxy between Skia's SkCanvas and the framework Canvas.
This enables Picture.java to be replayed into HWUI in addition
to extending the Skia testing suite to HWUI.
Bug:
19011232
Change-Id: Id27ac03eec817b0784763e62ab8413a07b3b8cb2
Chris Craik [Fri, 30 Jan 2015 17:46:18 +0000 (09:46 -0800)]
Fix double create of Caches
bug:
19208182
Change-Id: I91ac591cecc207da1b102013ca4985dd075cca80
Todd Kennedy [Fri, 30 Jan 2015 17:39:53 +0000 (09:39 -0800)]
Show stacks underneath a resized stack
When a stack is resized, make sure any non-fullscreen stack beneath it
becomes visible. This may mean additional activities are resumed in the
process.
Bug:
19083171
Change-Id: I5e7a3f82d76932ea2b9dbf0324ea183c42ee5496
Jason Monk [Fri, 30 Jan 2015 16:30:29 +0000 (11:30 -0500)]
Fix expandSettingsPanel status bar call
Use the same mechanism as the two finger gesture to get it to open
correctly.
Bug:
19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
Lorenzo Colitti [Fri, 30 Jan 2015 15:59:49 +0000 (15:59 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration." automerge:
c565a56 automerge:
5b392ee
automerge:
a0057ad
* commit '
a0057ad69083dc09c0c853fd20119f5a9ea877d9':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 15:58:39 +0000 (15:58 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge:
fba459d automerge:
786deba
automerge:
b6088a8
* commit '
b6088a80b4c3309cd18f5eb46ecf0614af8339ec':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 15:56:00 +0000 (15:56 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration." automerge:
c565a56
automerge:
5b392ee
* commit '
5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 15:54:45 +0000 (15:54 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge:
fba459d
automerge:
786deba
* commit '
786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
Derek Sollenberger [Fri, 30 Jan 2015 14:25:22 +0000 (14:25 +0000)]
Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"
Leon Scroggins III [Fri, 30 Jan 2015 14:12:26 +0000 (14:12 +0000)]
Merge "AvoidXferMode -> AvoidXfermode."
Leon Scroggins III [Fri, 30 Jan 2015 14:05:11 +0000 (09:05 -0500)]
AvoidXferMode -> AvoidXfermode.
When I moved this code here from external/skia, I accidentally changed
the lowercase 'm' to uppercase 'M'. Change back, to keep consistent
with SkXfermode and Xfermode.cpp.
Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
Leon Scroggins III [Fri, 30 Jan 2015 13:55:22 +0000 (13:55 +0000)]
Merge "Move SkAvoidXferMode into frameworks/base."
Leon Scroggins III [Thu, 29 Jan 2015 18:46:57 +0000 (13:46 -0500)]
Move SkAvoidXferMode into frameworks/base.
We are removing it from Skia, so we need it here to support Android.
Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).
BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
Narayan Kamath [Fri, 30 Jan 2015 13:07:32 +0000 (13:07 +0000)]
Revert "Remove deprecated Telecom APIs"
This reverts commit
a7c9046973260aa71837410ffc8df8c296a2826f.
Change-Id: I66d3d961988ff8dd330c9482c070bfca055f6cb8
Lorenzo Colitti [Fri, 30 Jan 2015 12:15:39 +0000 (12:15 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
automerge:
c565a56
* commit '
c565a5675ac33d97d5c1caed7a5629412997fb4a':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 12:13:38 +0000 (12:13 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
automerge:
fba459d
* commit '
fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 07:07:48 +0000 (07:07 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
Lorenzo Colitti [Fri, 30 Jan 2015 07:00:38 +0000 (07:00 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
Sailesh Nepal [Fri, 12 Dec 2014 23:26:29 +0000 (15:26 -0800)]
Remove deprecated Telecom APIs
This APIs are no longer used and are safe to delete.
Bug:
18607657
Change-Id: I94dad196db9f8be544f05b12b7b71de124fc9328
Alan Viverette [Fri, 30 Jan 2015 03:34:25 +0000 (03:34 +0000)]
am
f607fa6b: am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
automerge:
c89cdf2
* commit '
c89cdf2ad435b3b5da16405a0eceb600e93b7a3e':
Avoid bug in LinearLayout measurement
Alan Viverette [Fri, 30 Jan 2015 03:32:33 +0000 (03:32 +0000)]
am
f607fa6b: am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
* commit '
f607fa6b73019998588e613aa2ae8ee97958cee7':
Avoid bug in LinearLayout measurement
Alan Viverette [Fri, 30 Jan 2015 03:20:44 +0000 (03:20 +0000)]
am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
* commit '
d38cc749215c0e41bcb06703066c379de83d91e4':
Avoid bug in LinearLayout measurement
Alan Viverette [Fri, 30 Jan 2015 03:15:06 +0000 (03:15 +0000)]
Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
Christopher Ferris [Fri, 30 Jan 2015 02:42:32 +0000 (02:42 +0000)]
am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev automerge:
5d0cf917
automerge:
fd00f1e
* commit '
fd00f1e92606e656ea305eeead6f21fb991e9a57':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 02:40:09 +0000 (02:40 +0000)]
am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
automerge:
5d0cf917
* commit '
5d0cf917c3e21490ed709e27893b9f02e997cf52':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 02:33:34 +0000 (02:33 +0000)]
am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
* commit '
fd41feee6b909670010da79a0800c1aa2ce44255':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 02:29:26 +0000 (02:29 +0000)]
Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
Rich Slogar [Fri, 30 Jan 2015 02:18:32 +0000 (02:18 +0000)]
am
4649dcd7: am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge:
e9e2707
automerge:
9c64950
* commit '
9c64950ee269eda596f894c05224b51b8be53739':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 02:17:00 +0000 (02:17 +0000)]
am
b2788236: am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge:
1b5a0fb
automerge:
811935e
* commit '
811935e51c17f116e68b01828ba2a2bf5f4ac41f':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 02:15:33 +0000 (02:15 +0000)]
am
4ca01ef2: am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text automerge:
9ad282f
automerge:
ec1e8aa
* commit '
ec1e8aa6afc59a2f2f8581a333a02dcdeffada87':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 02:13:45 +0000 (02:13 +0000)]
am
4649dcd7: am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge:
e9e2707
* commit '
4649dcd7c41aa3893ff0e52c5142a7d95c678b7b':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 02:13:40 +0000 (02:13 +0000)]
am
b2788236: am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge:
1b5a0fb
* commit '
b27882361ec5b0602d55783131ba28942b318a77':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 02:13:34 +0000 (02:13 +0000)]
am
4ca01ef2: am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text automerge:
9ad282f
* commit '
4ca01ef21d7eacf398989740c6985a97891111e6':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 02:10:53 +0000 (02:10 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
automerge:
e9e2707
* commit '
e9e2707feffd01c39252afcdea15523c9883a7ea':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 02:09:16 +0000 (02:09 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
automerge:
1b5a0fb
* commit '
1b5a0fb681c3e2c1aad2d8a9b5313c2bd1b93220':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 02:07:44 +0000 (02:07 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
automerge:
9ad282f
* commit '
9ad282fd73141685a2fc0d3474676ab10ddc4e1f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:58:22 +0000 (01:58 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
docs: linux requirements update
Fyodor Kupolov [Thu, 29 Jan 2015 21:24:03 +0000 (13:24 -0800)]
Removed userHandle from setXXX methods
User handle is now extracted from UID of the calling process.
Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.
Bug:
17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
Scott Rowe [Fri, 30 Jan 2015 01:53:53 +0000 (01:53 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:53:48 +0000 (01:53 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:49:12 +0000 (01:49 +0000)]
am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
6ccb72e685da6769d43545c21182ca44e039da3e':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:44:43 +0000 (01:44 +0000)]
am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
a303121168f1e3cfe62f6836a38ba1a33f3e336d':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:44:39 +0000 (01:44 +0000)]
am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
e4249f29ea56f35aab1337323a0e55992ee9247f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
e0063faa8707e2424a33625aaf2228540fa67e85':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
b86c3b80db09da85b50c1809520bbf893cb83d93':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Alan Viverette [Fri, 30 Jan 2015 01:21:21 +0000 (17:21 -0800)]
Avoid bug in LinearLayout measurement
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.
Bug:
19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
Dianne Hackborn [Fri, 30 Jan 2015 01:27:21 +0000 (01:27 +0000)]
Merge "Improve messaging of pre boot apps."
Dianne Hackborn [Fri, 30 Jan 2015 01:22:25 +0000 (17:22 -0800)]
Improve messaging of pre boot apps.
Have the system take care of showing the boot message
as it runs pre boot apps, rather than relying on them
doing this on their own.
Change-Id: Ife6db0691907cf413311dafb4b023e63e8795a79
Amit Mahajan [Fri, 30 Jan 2015 01:05:24 +0000 (01:05 +0000)]
am
d492aa08: am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
automerge:
ed1a463
* commit '
ed1a46393e50cb2954876ef19ca539829fdf4a19':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
Amit Mahajan [Fri, 30 Jan 2015 01:03:30 +0000 (01:03 +0000)]
am
d492aa08: am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
* commit '
d492aa08206d21ba2e5ba533532630e5abe0bffe':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
Amit Mahajan [Fri, 30 Jan 2015 00:56:35 +0000 (00:56 +0000)]
am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
* commit '
45446c632162eb61a213815363149175732de78d':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
Amit Mahajan [Fri, 30 Jan 2015 00:52:49 +0000 (00:52 +0000)]
Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
Sailesh Nepal [Fri, 30 Jan 2015 00:45:41 +0000 (00:45 +0000)]
am
0d30c930: am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
automerge:
3f8a5ed
* commit '
3f8a5ed5b4907cdaf0813e849e49131c82a3f634':
Fix crash when making emergency calls
Sailesh Nepal [Fri, 30 Jan 2015 00:41:23 +0000 (00:41 +0000)]
am
0d30c930: am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
* commit '
0d30c930c39fb48bbec68158dc9a39d4fbfdff9f':
Fix crash when making emergency calls
Zhen Yu Song [Fri, 30 Jan 2015 00:37:10 +0000 (00:37 +0000)]
Merge "+ Update api file."
Sailesh Nepal [Fri, 30 Jan 2015 00:36:07 +0000 (00:36 +0000)]
am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
* commit '
38710f03c92a57ec00830e146a0714254c635405':
Fix crash when making emergency calls
Sailesh Nepal [Fri, 30 Jan 2015 00:31:11 +0000 (00:31 +0000)]
Merge "Fix crash when making emergency calls" into lmp-mr1-dev
Zhen Yu Song [Fri, 30 Jan 2015 00:28:18 +0000 (16:28 -0800)]
+ Update api file.
Change-Id: I1a2abb974c6a789c3533a44d3ceb70cf6701b9f9
Christopher Tate [Fri, 30 Jan 2015 00:21:25 +0000 (00:21 +0000)]
am
7041420d: am
9b36d111: am
b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit '
7041420d9b0ca1e0f79157ccace48ac4e29adc29':
Don't run full-data backups when backup is disabled
Christopher Ferris [Fri, 30 Jan 2015 00:21:24 +0000 (00:21 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Christopher Ferris [Fri, 30 Jan 2015 00:21:12 +0000 (00:21 +0000)]
am
0654196f: am
e7a69cbf: am
dbd03924: Merge "Fix wrap property creation when truncating."
* commit '
0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
Fix wrap property creation when truncating.
Christopher Ferris [Fri, 30 Jan 2015 00:19:47 +0000 (00:19 +0000)]
am
e7a69cbf: am
dbd03924: Merge "Fix wrap property creation when truncating."
automerge:
0654196
* commit '
0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
Fix wrap property creation when truncating.
Christopher Tate [Fri, 30 Jan 2015 00:17:19 +0000 (00:17 +0000)]
am
9b36d111: am
b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit '
9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
Don't run full-data backups when backup is disabled
RoboErik [Wed, 21 Jan 2015 23:45:32 +0000 (15:45 -0800)]
Move mute/unmute handling to adjust volume paths
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.
Also updates the hidden master versions of these APIs.
Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
Christopher Ferris [Fri, 30 Jan 2015 00:14:17 +0000 (00:14 +0000)]
am
e7a69cbf: am
dbd03924: Merge "Fix wrap property creation when truncating."
* commit '
e7a69cbf920565b4b428459198fd53f193080796':
Fix wrap property creation when truncating.
Christopher Tate [Fri, 30 Jan 2015 00:11:59 +0000 (00:11 +0000)]
am
b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit '
b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
Don't run full-data backups when backup is disabled
Christopher Tate [Fri, 30 Jan 2015 00:06:17 +0000 (00:06 +0000)]
Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
Winson Chung [Tue, 27 Jan 2015 00:11:07 +0000 (16:11 -0800)]
Adding some debug controls to test multi-window.
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.
Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
Christopher Ferris [Thu, 29 Jan 2015 01:56:32 +0000 (17:56 -0800)]
Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.
Bug:
19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
(cherry picked from commit
e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)
Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
Christopher Ferris [Thu, 29 Jan 2015 23:51:16 +0000 (23:51 +0000)]
am
dbd03924: Merge "Fix wrap property creation when truncating."
* commit '
dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
Fix wrap property creation when truncating.
Zhijun He [Thu, 29 Jan 2015 23:48:01 +0000 (23:48 +0000)]
Merge "Camera2: metadata spec update for reprocessing"