OSDN Git Service
Andre Eisenbach [Wed, 10 Dec 2014 18:49:41 +0000 (18:49 +0000)]
am
c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
automerge:
e832393
* commit '
e8323934c7dd01228b6550ac5dcad08999371a61':
Prevent NullPointerException in getStringValue if no value is set
Eric Laurent [Wed, 10 Dec 2014 18:42:08 +0000 (10:42 -0800)]
resolved conflicts for merge of
5196dd04 to lmp-mr1-dev-plus-aosp
Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
Craig Mautner [Wed, 10 Dec 2014 18:04:52 +0000 (18:04 +0000)]
am
7438b57c: am
2de55513: Merge "Only one task within the stack should moveToBack"
* commit '
7438b57c8d1e1649c51c570fe71aef861854730d':
Only one task within the stack should moveToBack
Craig Mautner [Wed, 10 Dec 2014 17:57:34 +0000 (17:57 +0000)]
am
2de55513: Merge "Only one task within the stack should moveToBack"
* commit '
2de55513f81b238ea42b2b36cbf61e8c1a475c45':
Only one task within the stack should moveToBack
Craig Mautner [Wed, 10 Dec 2014 17:51:31 +0000 (17:51 +0000)]
Merge "Only one task within the stack should moveToBack"
Andre Eisenbach [Wed, 10 Dec 2014 02:36:10 +0000 (02:36 +0000)]
am
c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
* commit '
c91499842fed63c55326e7e2a71b491f7c9315c1':
Prevent NullPointerException in getStringValue if no value is set
Andre Eisenbach [Wed, 10 Dec 2014 02:31:31 +0000 (02:31 +0000)]
Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
Eric Laurent [Wed, 10 Dec 2014 01:34:33 +0000 (01:34 +0000)]
Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev
automerge:
65bc112
* commit '
65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0':
AudioSystem JNI: Add audio policy custom mixes registration
Eric Laurent [Wed, 10 Dec 2014 01:33:07 +0000 (01:33 +0000)]
Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev
Wale Ogunwale [Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)]
Always take an activity screenshot when pausing. automerge:
37f2718
automerge:
bfa6059
* commit '
bfa6059b78dfe0a40e71df055c60e431478a3e9d':
Always take an activity screenshot when pausing.
Wale Ogunwale [Wed, 10 Dec 2014 00:57:51 +0000 (00:57 +0000)]
Always take an activity screenshot when pausing.
automerge:
37f2718
* commit '
37f271869ed9c9e9f0e7de7339017e0bb6719780':
Always take an activity screenshot when pausing.
Wale Ogunwale [Tue, 9 Dec 2014 22:02:27 +0000 (14:02 -0800)]
Always take an activity screenshot when pausing.
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.
Bug:
18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit
eacdf2ce04899b0a3abef55e4e7e1fe9c1649932)
Andre Eisenbach [Wed, 10 Dec 2014 00:42:14 +0000 (16:42 -0800)]
Prevent NullPointerException in getStringValue if no value is set
Bug:
18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
Amith Yamasani [Wed, 10 Dec 2014 00:35:52 +0000 (00:35 +0000)]
Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge:
dad85a6
automerge:
7acd880
* commit '
7acd8802d7c14323dfc2a5e68b1d2a82f9d3f5c0':
Allow user shutdown broadcasts to be delivered
Amith Yamasani [Wed, 10 Dec 2014 00:33:24 +0000 (00:33 +0000)]
Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev
automerge:
dad85a6
* commit '
dad85a6c4bf51c126978d584703a5320be7f396c':
Allow user shutdown broadcasts to be delivered
Amith Yamasani [Wed, 10 Dec 2014 00:30:29 +0000 (00:30 +0000)]
Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev
Michael Wright [Wed, 10 Dec 2014 00:01:23 +0000 (00:01 +0000)]
am
c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev
automerge:
422db53
* commit '
422db53f8cf2fc69cdf892cb42f33021f510f207':
Don't try to scale the bitmaps for null MediaMetadata.
Jeff Sharkey [Tue, 9 Dec 2014 23:59:58 +0000 (23:59 +0000)]
am
1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev
automerge:
8650c35
* commit '
8650c358fb44b943dd74751742333bf1cebf7b8e':
Throw IOException when missing default ringtone.
Joe Fernandez [Tue, 9 Dec 2014 23:58:36 +0000 (23:58 +0000)]
am
a82fc60c: am
6d481852: am
b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge:
d36d2aa
automerge:
509815b
* commit '
509815b8a7059fbe67bd44c0b071a1e96977ce60':
:docs studio tips and tricks headings updates
Michael Wright [Tue, 9 Dec 2014 23:44:00 +0000 (23:44 +0000)]
am
c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev
* commit '
c6de3212c2dd8638bf3150719ed331673fdcab06':
Don't try to scale the bitmaps for null MediaMetadata.
Jeff Sharkey [Tue, 9 Dec 2014 23:43:53 +0000 (23:43 +0000)]
am
1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev
* commit '
1102e712c11e7679da89a2f66288ca4fad4df85c':
Throw IOException when missing default ringtone.
Michael Wright [Tue, 9 Dec 2014 23:39:48 +0000 (23:39 +0000)]
Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev
John Reck [Tue, 9 Dec 2014 23:38:38 +0000 (15:38 -0800)]
resolved conflicts for merge of
fe11126d to lmp-mr1-dev-plus-aosp
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
Jeff Sharkey [Tue, 9 Dec 2014 23:34:05 +0000 (23:34 +0000)]
Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev
Joe Fernandez [Tue, 9 Dec 2014 23:28:59 +0000 (23:28 +0000)]
am
a82fc60c: am
6d481852: am
b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
automerge:
d36d2aa
* commit '
d36d2aad9de1859bbf4ef6c1b429e8ac00ddcb2f':
:docs studio tips and tricks headings updates
Jeff Sharkey [Tue, 9 Dec 2014 23:27:19 +0000 (15:27 -0800)]
Throw IOException when missing default ringtone.
This is caught by Ringtone, and we then fall back to built-in
ringtone, which matches the expected CTS behavior.
Bug:
18610451
Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
Joe Fernandez [Tue, 9 Dec 2014 23:22:42 +0000 (23:22 +0000)]
am
a82fc60c: am
6d481852: am
b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
* commit '
a82fc60ce4cc0f7d1167330f4cbb5736551ddd5c':
:docs studio tips and tricks headings updates
Ruben Brunk [Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)]
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge:
3ef5033
automerge:
6d98265
* commit '
6d9826546d89e03cea170ebb5b3f292d5f4a027b':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
John Reck [Tue, 9 Dec 2014 23:18:08 +0000 (23:18 +0000)]
am
4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
* commit '
4f1942d999c60fd91cb826651b6d978d47a74321':
Teach AssetAtlas about more drawables
Ricardo Cervera [Tue, 9 Dec 2014 23:15:38 +0000 (23:15 +0000)]
am
614889aa: am
4a6bafcb: am
12a24dc9: am
47fa6355: am
5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '
614889aa1ad68f9e92517bb618193744adc78c0d':
docs: Adding links to material design videos
Ruben Brunk [Tue, 9 Dec 2014 23:13:06 +0000 (23:13 +0000)]
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
automerge:
3ef5033
* commit '
3ef5033cdacbc44702d0b6ba687e81383348e2fd':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
Joe Fernandez [Tue, 9 Dec 2014 23:12:53 +0000 (23:12 +0000)]
am
6d481852: am
b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
* commit '
6d4818529e435b2e6d285233bd0668e3ba25f6c9':
:docs studio tips and tricks headings updates
John Reck [Tue, 9 Dec 2014 23:12:41 +0000 (23:12 +0000)]
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
Ruben Brunk [Tue, 9 Dec 2014 23:09:50 +0000 (23:09 +0000)]
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
Joe Fernandez [Tue, 9 Dec 2014 23:04:13 +0000 (23:04 +0000)]
am
b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
* commit '
b35a509d0eb4d9c150630fc6108f4bc039a09043':
:docs studio tips and tricks headings updates
Ricardo Cervera [Tue, 9 Dec 2014 22:56:52 +0000 (22:56 +0000)]
am
4a6bafcb: am
12a24dc9: am
47fa6355: am
5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '
4a6bafcb56d5fe5e2f30626b8836559e722e89a0':
docs: Adding links to material design videos
Joe Fernandez [Tue, 9 Dec 2014 22:56:36 +0000 (22:56 +0000)]
Merge ":docs studio tips and tricks headings updates" into lmp-docs
Ricardo Cervera [Tue, 9 Dec 2014 22:49:10 +0000 (22:49 +0000)]
am
12a24dc9: am
47fa6355: am
5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '
12a24dc91fa4de5b897acff9a6435647429040d7':
docs: Adding links to material design videos
Ricardo Cervera [Tue, 9 Dec 2014 22:40:55 +0000 (22:40 +0000)]
am
47fa6355: am
5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '
47fa63553bc53d46bc5e1b8873ff81a774d399e7':
docs: Adding links to material design videos
Rich Slogar [Tue, 9 Dec 2014 22:23:18 +0000 (14:23 -0800)]
:docs studio tips and tricks headings updates
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
Elliott Hughes [Tue, 9 Dec 2014 22:19:15 +0000 (22:19 +0000)]
smain@google.com [Tue, 9 Dec 2014 22:19:09 +0000 (22:19 +0000)]
am
92b6011d: am
9ecc18e2: am
4267450e: am
780a2231: am
2023bec7: revise ADT migration message b/
18668828 and fix broken link
* commit '
92b6011d950a8dee26b43eb107313e98a285009c':
revise ADT migration message b/
18668828 and fix broken link
smain@google.com [Tue, 9 Dec 2014 22:19:04 +0000 (22:19 +0000)]
am
1bc5b1b9: am
325af3a6: am
5d3ea8af: am
fe4b4009: am
a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs
* commit '
1bc5b1b9878e684b111f1edf85e9816aa156da3b':
clarify release notes pages with more specific titles and new links to related docs.
Rich Slogar [Tue, 9 Dec 2014 22:18:57 +0000 (22:18 +0000)]
am
6b07b40d: am
00d635c0: am
fbbab546: am
d3d4fe4d: am
01ab09c2: docs:studio basics images updates
* commit '
6b07b40da50d04d05d751cf46fa0407d1372c654':
docs:studio basics images updates
Joe Fernandez [Tue, 9 Dec 2014 22:18:50 +0000 (22:18 +0000)]
am
55677d8a: am
33a0828e: am
2a83bc2b: am
4c3b3324: am
f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
* commit '
55677d8ad53da5a9c371eebb4368c695483e00f9':
docs: Change Eclipse deprecation language on sdk/index.html page
smain@google.com [Tue, 9 Dec 2014 22:18:45 +0000 (22:18 +0000)]
am
2049cc91: am
8503307d: am
d7ce432a: am
2317aa2f: am
c4a0882a: edits to sdk install instructions.
* commit '
2049cc91e3c799f19f7c71b101f91fe838d61d05':
edits to sdk install instructions.
smain@google.com [Tue, 9 Dec 2014 22:18:39 +0000 (22:18 +0000)]
am
7ee7d325: am
664ab723: am
aba6a432: am
02cd3a40: am
6ae492e6: changes to deprecate eclipse docs and update migration guide
* commit '
7ee7d3252cd1becd94de386ae02ad4229fa08f04':
changes to deprecate eclipse docs and update migration guide
John Reck [Tue, 9 Dec 2014 20:33:26 +0000 (12:33 -0800)]
Teach AssetAtlas about more drawables
Bug:
18317479
Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
Derek Sollenberger [Tue, 9 Dec 2014 22:18:33 +0000 (22:18 +0000)]
am
497499b1: am
04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev
* commit '
497499b1eb76726090ea46dcfc5b8ab0221cd447':
Remove unnecessary/erroneous reference counting
John Reck [Tue, 9 Dec 2014 22:18:27 +0000 (22:18 +0000)]
am
7d74cb6c: am
14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
* commit '
7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
Fix issue with RNA destruction mid-animation
Ricardo Cervera [Tue, 9 Dec 2014 22:16:58 +0000 (22:16 +0000)]
am
5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '
5155840ba091f62ea3079328b25a620089223887':
docs: Adding links to material design videos
Jason Monk [Tue, 9 Dec 2014 22:09:56 +0000 (22:09 +0000)]
am
7940f55c: am
6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev
* commit '
7940f55c3a1e4038cb01e9909717edbf34d83391':
Push inet condition to new MobileSignalControllers
Elliott Hughes [Tue, 9 Dec 2014 22:09:25 +0000 (22:09 +0000)]
am
0aac16bb: am
b034de7e: am
12f100de: am
e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '
0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
Fix typo.
smain@google.com [Tue, 9 Dec 2014 22:09:20 +0000 (22:09 +0000)]
am
9ecc18e2: am
4267450e: am
780a2231: am
2023bec7: revise ADT migration message b/
18668828 and fix broken link
* commit '
9ecc18e2e39348abed90eaadf4319b0614c87097':
revise ADT migration message b/
18668828 and fix broken link
smain@google.com [Tue, 9 Dec 2014 22:09:14 +0000 (22:09 +0000)]
am
325af3a6: am
5d3ea8af: am
fe4b4009: am
a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs
* commit '
325af3a659a9e15225f5ec3f62ed4682884f103f':
clarify release notes pages with more specific titles and new links to related docs.
Rich Slogar [Tue, 9 Dec 2014 22:09:08 +0000 (22:09 +0000)]
am
00d635c0: am
fbbab546: am
d3d4fe4d: am
01ab09c2: docs:studio basics images updates
* commit '
00d635c0ec07156fd5e98d7c34054a53f0a16545':
docs:studio basics images updates
Joe Fernandez [Tue, 9 Dec 2014 22:09:03 +0000 (22:09 +0000)]
am
33a0828e: am
2a83bc2b: am
4c3b3324: am
f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
* commit '
33a0828ea6a9bda7eb2e0367a81d396ede5ace9a':
docs: Change Eclipse deprecation language on sdk/index.html page
smain@google.com [Tue, 9 Dec 2014 22:08:58 +0000 (22:08 +0000)]
am
8503307d: am
d7ce432a: am
2317aa2f: am
c4a0882a: edits to sdk install instructions.
* commit '
8503307d67d53f94277ab6b9dbb7f5c59c6aaa85':
edits to sdk install instructions.
smain@google.com [Tue, 9 Dec 2014 22:08:53 +0000 (22:08 +0000)]
am
664ab723: am
aba6a432: am
02cd3a40: am
6ae492e6: changes to deprecate eclipse docs and update migration guide
* commit '
664ab72332b174829306cb03a4c23ee1442cede3':
changes to deprecate eclipse docs and update migration guide
Derek Sollenberger [Tue, 9 Dec 2014 22:08:47 +0000 (22:08 +0000)]
am
04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev
* commit '
04c2bf4f17091eeb07b96bb0571aa6ad3a45d96b':
Remove unnecessary/erroneous reference counting
John Reck [Tue, 9 Dec 2014 22:08:42 +0000 (22:08 +0000)]
am
14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
* commit '
14c436897ca56800a3758008f0631c559a898967':
Fix issue with RNA destruction mid-animation
Elliott Hughes [Tue, 9 Dec 2014 21:34:06 +0000 (21:34 +0000)]
am
b034de7e: am
12f100de: am
e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '
b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
smain@google.com [Tue, 9 Dec 2014 21:34:02 +0000 (21:34 +0000)]
am
4267450e: am
780a2231: am
2023bec7: revise ADT migration message b/
18668828 and fix broken link
* commit '
4267450e98ae78877cf77a3b28fb4f449b314114':
revise ADT migration message b/
18668828 and fix broken link
smain@google.com [Tue, 9 Dec 2014 21:33:31 +0000 (21:33 +0000)]
am
5d3ea8af: am
fe4b4009: am
a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs
* commit '
5d3ea8af3ce46e53362fda3e42a3df6488ba6367':
clarify release notes pages with more specific titles and new links to related docs.
Rich Slogar [Tue, 9 Dec 2014 21:33:06 +0000 (21:33 +0000)]
am
fbbab546: am
d3d4fe4d: am
01ab09c2: docs:studio basics images updates
* commit '
fbbab5467e5e9af8493099b51ab403ffceb4bd92':
docs:studio basics images updates
Joe Fernandez [Tue, 9 Dec 2014 21:33:02 +0000 (21:33 +0000)]
am
2a83bc2b: am
4c3b3324: am
f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
* commit '
2a83bc2be699069ca3791d920d0ebfc219baaa70':
docs: Change Eclipse deprecation language on sdk/index.html page
smain@google.com [Tue, 9 Dec 2014 21:32:58 +0000 (21:32 +0000)]
am
d7ce432a: am
2317aa2f: am
c4a0882a: edits to sdk install instructions.
* commit '
d7ce432ae4ca49f42b23f0bcdc44a091ee96a557':
edits to sdk install instructions.
smain@google.com [Tue, 9 Dec 2014 21:32:52 +0000 (21:32 +0000)]
am
aba6a432: am
02cd3a40: am
6ae492e6: changes to deprecate eclipse docs and update migration guide
* commit '
aba6a4327bf175fff57235cca49955a209b0c034':
changes to deprecate eclipse docs and update migration guide
Derek Sollenberger [Tue, 9 Dec 2014 21:27:38 +0000 (21:27 +0000)]
Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev
Michael Wright [Tue, 9 Dec 2014 21:16:26 +0000 (13:16 -0800)]
Don't try to scale the bitmaps for null MediaMetadata.
Bug:
18586572
Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
Ricardo Cervera [Tue, 9 Dec 2014 21:16:39 +0000 (21:16 +0000)]
Merge "docs: Adding links to material design videos" into lmp-docs
John Reck [Tue, 9 Dec 2014 20:37:15 +0000 (20:37 +0000)]
Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
Amith Yamasani [Tue, 9 Dec 2014 20:36:57 +0000 (12:36 -0800)]
Allow user shutdown broadcasts to be delivered
Fixes a regression that prevents the user from being fully shutdown
after being stopped. Wasn't killing all user processes.
Bug:
7462778
Change-Id: Iee7231f7c8a167e8a61549b149294b2dbef071c1
John Reck [Tue, 9 Dec 2014 17:07:35 +0000 (09:07 -0800)]
Fix issue with RNA destruction mid-animation
Bug:
18521508
Fix an issue where an RNA's native object was destroyed
before the java-side object was started
Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:34:55 +0000 (20:34 +0000)]
am
bf7b4d94: am
f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
* commit '
bf7b4d9489a10dd1ed39175c55abafc3bef9c2a9':
Added configuration to determine whether VoLTE requires provisioning.
Jason Monk [Tue, 9 Dec 2014 20:34:55 +0000 (20:34 +0000)]
am
6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev
* commit '
6f6bc554fad7cc2166ea561a1171bd1ffc961498':
Push inet condition to new MobileSignalControllers
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:34:48 +0000 (20:34 +0000)]
am
1e989df5: am
49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev
* commit '
1e989df50d3435c47c8685caabb463ec34f59840':
IMS: change getMasterValue to getProvisionedValue.
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:34:43 +0000 (20:34 +0000)]
am
d2762ca9: am
14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev
* commit '
d2762ca9bcb902cc9c66d26ac4268d14a164c46e':
IMS: add ImsConfig api to get volte provisioned value.
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:17:26 +0000 (20:17 +0000)]
am
f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
* commit '
f996d6b7ffcfa813727ba57a30903d1f9e2666da':
Added configuration to determine whether VoLTE requires provisioning.
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:17:20 +0000 (20:17 +0000)]
am
49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev
* commit '
49b00a9ca4281b45234d264871428f800083e77f':
IMS: change getMasterValue to getProvisionedValue.
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:17:15 +0000 (20:17 +0000)]
am
14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev
* commit '
14370741898c8725314d638e58da1ca6e12876b7':
IMS: add ImsConfig api to get volte provisioned value.
Jason Monk [Tue, 9 Dec 2014 20:13:31 +0000 (20:13 +0000)]
Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:06:53 +0000 (20:06 +0000)]
Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:06:26 +0000 (20:06 +0000)]
Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 9 Dec 2014 20:05:56 +0000 (20:05 +0000)]
Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 02:01:36 +0000 (18:01 -0800)]
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
Bug:
16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
Elliott Hughes [Tue, 9 Dec 2014 19:30:26 +0000 (19:30 +0000)]
am
12f100de: am
e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '
12f100def9e34a554df07f47badc259028ac4c68':
Fix typo.
Elliott Hughes [Tue, 9 Dec 2014 19:22:33 +0000 (19:22 +0000)]
am
e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '
e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
Fix typo.
Elliott Hughes [Tue, 9 Dec 2014 19:16:16 +0000 (19:16 +0000)]
Merge "Fix typo." into lmp-docs
smain@google.com [Tue, 9 Dec 2014 19:04:30 +0000 (19:04 +0000)]
am
780a2231: am
2023bec7: revise ADT migration message b/
18668828 and fix broken link
* commit '
780a2231ff23d85e56a7a7ddd4a4768d85d6a0c9':
revise ADT migration message b/
18668828 and fix broken link
Selim Cinek [Tue, 9 Dec 2014 18:59:35 +0000 (18:59 +0000)]
am
e2389908: am
24232396: Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev
* commit '
e2389908b7c26499752023aefbb530889014c3a5':
Fixed accessibility for the pin input view on keyguard.
Adrian Roos [Tue, 9 Dec 2014 18:59:29 +0000 (18:59 +0000)]
am
a7065ea3: am
c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
* commit '
a7065ea363bd2bcebd31cccf114f36c8f578a22b':
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
smain@google.com [Tue, 9 Dec 2014 18:56:20 +0000 (18:56 +0000)]
am
2023bec7: revise ADT migration message b/
18668828 and fix broken link
* commit '
2023bec7bfed3175819abbe59ebc974872c7981c':
revise ADT migration message b/
18668828 and fix broken link
Selim Cinek [Tue, 9 Dec 2014 18:52:19 +0000 (18:52 +0000)]
am
24232396: Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev
* commit '
242323969dff16cfe93f67a388754486e7d863c6':
Fixed accessibility for the pin input view on keyguard.
Adrian Roos [Tue, 9 Dec 2014 18:52:13 +0000 (18:52 +0000)]
am
c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
* commit '
c3642ef5c8582193f26b3875cebd902253709d5e':
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
Selim Cinek [Tue, 9 Dec 2014 18:48:50 +0000 (18:48 +0000)]
Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev
Adrian Roos [Tue, 9 Dec 2014 18:48:16 +0000 (18:48 +0000)]
am
87427ce5: am
456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev
* commit '
87427ce5035e860b5d90e8a1788ee44e31bec504':
Revert "Fix calculation of overscan insets in WindowState."
Adrian Roos [Tue, 9 Dec 2014 18:44:29 +0000 (18:44 +0000)]
Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
Adrian Roos [Tue, 9 Dec 2014 18:42:56 +0000 (18:42 +0000)]
am
456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev
* commit '
456e66749191bc2b6f1acb69a2b86f499a6ca73a':
Revert "Fix calculation of overscan insets in WindowState."
Derek Sollenberger [Tue, 9 Dec 2014 15:54:16 +0000 (10:54 -0500)]
Remove unnecessary/erroneous reference counting
The SkBitmap* used by HWUI holds a reference to the PixelRef (which
in turn holds the colorTable) so keeping an additional ref is not
only unnecessary, but also potentially problematic.
If a bitmap changes its pixelRef after it has been added to a displayList,
then we end up with unbalanced ref/unref calls that cause the newly added
PixelRef to be unref'd and prematurely deleted, while the original PixelRef
is leaked.
bug:
18659976
Change-Id: I34a06152e7bb2d733249a207dafd36b9b5dc0712
OSDN Git Service
