OSDN Git Service
Vinit Deshpande [Thu, 4 Dec 2014 15:16:26 +0000 (15:16 +0000)]
am
31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
* commit '
31bd4220855ded4ece67c8ae75227441a12a00a7':
Remove notification for SoftAP turned on
Geoff Mendal [Thu, 4 Dec 2014 15:16:21 +0000 (15:16 +0000)]
am
cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
cc7c68b54801e07107d6e212ae50a375d730e000':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 4 Dec 2014 15:16:15 +0000 (15:16 +0000)]
am
a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
a821e77d7ede196f6f39cd2ed2bc974bc68e162d':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 4 Dec 2014 15:16:10 +0000 (15:16 +0000)]
am
72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
72a204199510afdeb9cec483b4113433fe61089e':
Import translations. DO NOT MERGE
Erik Kline [Thu, 4 Dec 2014 15:16:04 +0000 (15:16 +0000)]
am
9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '
9261d9d64548f0221de50eb99f3675488a4176a4':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
John Spurlock [Thu, 4 Dec 2014 15:15:59 +0000 (15:15 +0000)]
am
32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev
* commit '
32b61ab28f54e5b00f472b2166f9b1100375e4ff':
Doze: Don't block pickup pulses on a proximity check.
Pavel Zhamaitsiak [Thu, 4 Dec 2014 15:15:53 +0000 (15:15 +0000)]
am
1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev
* commit '
1fb699360d1b193c5144c7dcf209d8dc8dfbb8b8':
IMS Call End Cause Additions
duho.ro [Thu, 4 Dec 2014 15:15:40 +0000 (15:15 +0000)]
am
fb754252: UICC : discard language setting of SIM
* commit '
fb7542522493101778862340c548db731f3a8681':
UICC : discard language setting of SIM
Cheuksan Wang [Thu, 4 Dec 2014 15:15:33 +0000 (15:15 +0000)]
am
109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
* commit '
109ec376da86de1275f73fa432d6344431a457e9':
new SMS/MMS carrier app API
John Reck [Thu, 4 Dec 2014 15:15:27 +0000 (15:15 +0000)]
am
bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
* commit '
bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
Winson Chung [Thu, 4 Dec 2014 15:15:21 +0000 (15:15 +0000)]
am
ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
* commit '
ba1307b2b42b60893c88622f41f99efa2356350d':
Ensuring that the alpha and translation animation durations are the same. (Bug
18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug
18552776)
Jim Miller [Thu, 4 Dec 2014 15:15:16 +0000 (15:15 +0000)]
am
3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
* commit '
3ea6824034ea8fbcd418af8e07606f60fd844e45':
Stop keyguard from spamming the log
xinhe [Thu, 4 Dec 2014 15:14:59 +0000 (15:14 +0000)]
am
8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
* commit '
8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
Unable to unlock SIM with a PIN/PUK
Wink Saville [Thu, 4 Dec 2014 15:14:49 +0000 (15:14 +0000)]
am
82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
* commit '
82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
Christopher Tate [Thu, 4 Dec 2014 15:14:43 +0000 (15:14 +0000)]
am
758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
* commit '
758f45217d9b7d257258ea41aa53f6364ac13918':
Adjust wallpaper-restore acceptance criteria
Vinit Deshpande [Thu, 4 Dec 2014 06:21:28 +0000 (06:21 +0000)]
Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
Geoff Mendal [Thu, 4 Dec 2014 05:44:57 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 05:32:18 +0000 (05:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 4 Dec 2014 05:05:32 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 04:54:51 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 4 Dec 2014 04:39:34 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 04:33:25 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Erik Kline [Thu, 4 Dec 2014 03:13:54 +0000 (03:13 +0000)]
Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
John Spurlock [Thu, 4 Dec 2014 03:03:20 +0000 (03:03 +0000)]
Merge "Doze: Don't block pickup pulses on a proximity check." into lmp-mr1-dev
Pavel Zhamaitsiak [Thu, 4 Dec 2014 01:59:43 +0000 (01:59 +0000)]
Merge "IMS Call End Cause Additions" into lmp-mr1-dev
duho.ro [Wed, 12 Nov 2014 04:06:27 +0000 (13:06 +0900)]
UICC : discard language setting of SIM
Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.
Bug:
18095177
Bug:
18108786
Change-Id: I40881fc64fea52480c968a18440740af9c8cff57
Omkar Kolangade [Tue, 2 Dec 2014 00:23:25 +0000 (16:23 -0800)]
IMS Call End Cause Additions
Adding call end reasons for the
following use cases:
1. User rejects/ends call due to
low battery.
2. User rejects call due to
blacklisted call ID.
Bug:
18481702
Change-Id: I3537c732880e60218c83ec69861cb788adc57bc1
Cheuksan Wang [Thu, 4 Dec 2014 00:19:05 +0000 (00:19 +0000)]
Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
John Reck [Thu, 4 Dec 2014 00:08:13 +0000 (00:08 +0000)]
Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
Winson Chung [Thu, 4 Dec 2014 00:07:55 +0000 (00:07 +0000)]
Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
* changes:
Ensuring that the alpha and translation animation durations are the same. (Bug
18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug
18552776)
Jim Miller [Wed, 3 Dec 2014 23:44:31 +0000 (23:44 +0000)]
Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
xinhe [Wed, 3 Dec 2014 23:39:29 +0000 (23:39 +0000)]
Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
xinhe [Tue, 2 Dec 2014 23:03:20 +0000 (15:03 -0800)]
Unable to unlock SIM with a PIN/PUK
call TelephonyManager.getSimState instead of accessing systemProperty
Bug:
18489776
Change-Id: I45d2315a588f706c4815750963dcfec9f8409c5d
Jim Miller [Wed, 3 Dec 2014 23:33:13 +0000 (15:33 -0800)]
Stop keyguard from spamming the log
Fixes bug
18147652
Change-Id: I9f6d3a6f1b8e3d6443c112ecf8a61ea2dc4e3434
Wink Saville [Wed, 3 Dec 2014 23:32:45 +0000 (23:32 +0000)]
Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
Christopher Tate [Wed, 3 Dec 2014 23:09:32 +0000 (23:09 +0000)]
Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
Robert Greenwalt [Wed, 3 Dec 2014 23:00:34 +0000 (23:00 +0000)]
am
647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
* commit '
647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
Separate voice/data roaming state and type
Eino-Ville Talvala [Wed, 3 Dec 2014 23:00:15 +0000 (23:00 +0000)]
am
d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
* commit '
d23f8b44d575dcdc00965aae5fffd97f0336df43':
Revert "Camera: Add new capability flags as system features as well"
Robert Greenwalt [Wed, 3 Dec 2014 22:18:23 +0000 (22:18 +0000)]
Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
Eino-Ville Talvala [Wed, 3 Dec 2014 22:01:40 +0000 (22:01 +0000)]
Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
Winson Chung [Wed, 3 Dec 2014 21:45:36 +0000 (13:45 -0800)]
Ensuring that the alpha and translation animation durations are the same. (Bug
18609321)
Dianne Hackborn [Wed, 3 Dec 2014 21:38:08 +0000 (21:38 +0000)]
am
f696efa2: Merge "Fix issue #
17948584: Application crash and phone restart when app..." into lmp-mr1-dev
* commit '
f696efa206089bde1274d972239ffb5a8185f613':
Fix issue #
17948584: Application crash and phone restart when app...
Dianne Hackborn [Wed, 3 Dec 2014 21:32:15 +0000 (21:32 +0000)]
Merge "Fix issue #
17948584: Application crash and phone restart when app..." into lmp-mr1-dev
Winson Chung [Wed, 3 Dec 2014 21:16:48 +0000 (13:16 -0800)]
Fix crash when user is both scrolling and tabbing through Recents. (Bug
18552776)
Alan Viverette [Wed, 3 Dec 2014 21:12:30 +0000 (21:12 +0000)]
am
d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev
* commit '
d3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
Slightly more button elevation to match Material spec
Dianne Hackborn [Wed, 3 Dec 2014 21:12:24 +0000 (21:12 +0000)]
am
281f36f5: Merge "Fix issue #
18607384: Run fstrim after every system update" into lmp-mr1-dev
* commit '
281f36f5483ade3800092a42109327347d8aaff6':
Fix issue #
18607384: Run fstrim after every system update
Alan Viverette [Wed, 3 Dec 2014 21:10:18 +0000 (21:10 +0000)]
Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev
Christopher Tate [Wed, 3 Dec 2014 21:07:24 +0000 (13:07 -0800)]
Adjust wallpaper-restore acceptance criteria
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.
Bug
18448052
Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
Dianne Hackborn [Wed, 3 Dec 2014 21:06:52 +0000 (21:06 +0000)]
Merge "Fix issue #
18607384: Run fstrim after every system update" into lmp-mr1-dev
John Spurlock [Wed, 3 Dec 2014 21:00:44 +0000 (16:00 -0500)]
Doze: Don't block pickup pulses on a proximity check.
Pulse immediately, assuming the pickup sensor will not fire
if prox=near. Perform a non-blocking additional proximity check
in these cases purely to collect verification diagnostics.
Also tweak the interpolator for pickup pulses to ramp up more
quickly.
Bug:
18373928
Change-Id: I8607f4b37435722e293db741c273914183cec7be
John Reck [Wed, 3 Dec 2014 21:01:07 +0000 (13:01 -0800)]
Resume RT-animations after a pauseSurface
Bug:
18203577
The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.
To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.
Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
Yin-Chia Yeh [Wed, 3 Dec 2014 20:54:23 +0000 (20:54 +0000)]
am
38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
* commit '
381343088f964b6428c483f741424a50ef41cb49':
Camera: update antibanding spec
Dianne Hackborn [Wed, 3 Dec 2014 20:44:48 +0000 (12:44 -0800)]
Fix issue #
18607384: Run fstrim after every system update
Change-Id: I06f4c0b9e6834a8c8bd85710dfd9fa16471b6ad2
Yin-Chia Yeh [Wed, 3 Dec 2014 20:44:03 +0000 (20:44 +0000)]
Merge "Camera: update antibanding spec" into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 20:41:52 +0000 (20:41 +0000)]
am
da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev
* commit '
da79c87f2e4502b02c29e9081dcdf52a742d29e5':
Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
Michael Wright [Wed, 3 Dec 2014 20:41:47 +0000 (20:41 +0000)]
am
22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
* commit '
22458842cf0f86044856e6bc3c3a5fb2eda00862':
Added Razer USA, Ltd serval DO NOT MERGE
Michael Wright [Wed, 3 Dec 2014 20:34:32 +0000 (20:34 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 20:34:18 +0000 (20:34 +0000)]
Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
John Spurlock [Wed, 3 Dec 2014 19:56:12 +0000 (19:56 +0000)]
am
cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
* commit '
cdf7f984870344de1b1237e2a7749a3e32b2b688':
Doze: Fast path for pickup pulses.
Sreeram Ramachandran [Wed, 3 Dec 2014 19:50:19 +0000 (19:50 +0000)]
am
932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
* commit '
932c33214729fe2d2b09f82ef60a72871f182654':
Fix docs per API review.
Etan Cohen [Wed, 3 Dec 2014 19:50:13 +0000 (19:50 +0000)]
am
7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
* commit '
7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
Add a global override for VoLTE calls (which leaves user setting in place)
Craig Mautner [Wed, 3 Dec 2014 19:49:46 +0000 (19:49 +0000)]
am
a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
* commit '
a9355bd1c5d80777172103bd4e694972fedf8e54':
Handle keyguard dismiss flags correctly
John Spurlock [Wed, 3 Dec 2014 19:49:24 +0000 (19:49 +0000)]
Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
Geoff Mendal [Wed, 3 Dec 2014 19:47:54 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfd76bed7ba5aa54f0549793ce00ad87702125c5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Dec 2014 19:39:03 +0000 (11:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I642b3b429f66a22dcbbdfc016211b08c77b230f1
Auto-generated-cl: translation import
Sreeram Ramachandran [Wed, 3 Dec 2014 19:15:36 +0000 (19:15 +0000)]
Merge "Fix docs per API review." into lmp-mr1-dev
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:50 +0000 (18:54 +0000)]
Revert "Camera: Add new capability flags as system features as well"
This reverts commit
6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.
Bug:
18281970
Bug:
18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
Etan Cohen [Mon, 24 Nov 2014 19:18:01 +0000 (11:18 -0800)]
Add a global override for VoLTE calls (which leaves user setting in place)
Bug:
18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
Sreeram Ramachandran [Wed, 3 Dec 2014 18:53:35 +0000 (10:53 -0800)]
Fix docs per API review.
Bug:
18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
John Spurlock [Tue, 2 Dec 2014 15:41:25 +0000 (10:41 -0500)]
Doze: Fast path for pickup pulses.
Decrease the pulse duration when pulsing for pickup.
Add an option to skip the proximity check entirely, but don't
turn it on yet.
Bug:
18373928
Change-Id: I54f8dee004229193a18d488759bf797a16470cab
Craig Mautner [Wed, 3 Dec 2014 18:41:28 +0000 (18:41 +0000)]
Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
Trevor Johns [Wed, 3 Dec 2014 18:36:30 +0000 (18:36 +0000)]
am
5244ab68: am
b769fc0c: am
512103d6: am
19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
* commit '
5244ab68e4aae1dd95f87e690f7df83c0e630cef':
Docs: Add "admin" to samples categories
Trevor Johns [Wed, 3 Dec 2014 18:36:25 +0000 (18:36 +0000)]
am
e218d0d3: am
25bc6be2: am
e57dda11: am
5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs
* commit '
e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
Docs: Remove NavigationDrawer sample from What's New page
Trevor Johns [Wed, 3 Dec 2014 18:36:20 +0000 (18:36 +0000)]
am
4360c12b: am
740b22a5: am
4263334b: am
6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs
* commit '
4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
Docs: Remove GitHub links from docs/samples/new/index.html
Winson Chung [Wed, 3 Dec 2014 18:36:15 +0000 (18:36 +0000)]
am
de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug
17672056, Bug
18291345)" into lmp-mr1-dev
* commit '
de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
Initial changes to add callback on task stack changes. (Bug
17672056, Bug
18291345)
Evan Charlton [Wed, 3 Dec 2014 18:36:10 +0000 (18:36 +0000)]
am
5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
* commit '
5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
Re-add Connection.getCallCapabilities
Nancy Chen [Wed, 3 Dec 2014 18:36:02 +0000 (18:36 +0000)]
am
6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev
* commit '
6963ff0e059977c901f4a961a24e7ffd3536af23':
Change a semi-colon to a colon in AudioState logging.
Paul Jensen [Wed, 3 Dec 2014 18:35:57 +0000 (18:35 +0000)]
am
f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
* commit '
f805ba7dcc0e3cde052e2d5a84dedd478f206806':
Retry failed network validation every 10 minutes.
Adam Lesinski [Wed, 3 Dec 2014 18:35:52 +0000 (18:35 +0000)]
am
91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
* commit '
91ca64ea291fceb43514b459ba76d13abc80f506':
AAPT: Add pathMotion custom classes to Proguard Keep set
Dianne Hackborn [Wed, 3 Dec 2014 18:35:46 +0000 (18:35 +0000)]
am
ef44c051: Merge "Work on issue #
18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev
* commit '
ef44c0514d497a789dca4731da61a2cf49bb3289':
Work on issue #
18572506: AppOps in-memory state is invalid after...
Dianne Hackborn [Wed, 3 Dec 2014 18:20:30 +0000 (10:20 -0800)]
Fix issue #
17948584: Application crash and phone restart when app...
...is installed with <provider> with empty string.
Don't allow empty authorities, just like we don't allow null authorities.
Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
Trevor Johns [Wed, 3 Dec 2014 18:12:47 +0000 (18:12 +0000)]
am
b769fc0c: am
512103d6: am
19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
* commit '
b769fc0c576f485022330b40ae5180fb23cc53ee':
Docs: Add "admin" to samples categories
Trevor Johns [Wed, 3 Dec 2014 18:12:37 +0000 (18:12 +0000)]
am
25bc6be2: am
e57dda11: am
5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs
* commit '
25bc6be2843fcff1be9c074f1e92dac1ce76d809':
Docs: Remove NavigationDrawer sample from What's New page
Trevor Johns [Wed, 3 Dec 2014 18:12:31 +0000 (18:12 +0000)]
am
740b22a5: am
4263334b: am
6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs
* commit '
740b22a522a224f88196ba33e06178e6a576f411':
Docs: Remove GitHub links from docs/samples/new/index.html
Winson Chung [Wed, 3 Dec 2014 18:10:36 +0000 (18:10 +0000)]
Merge "Initial changes to add callback on task stack changes. (Bug
17672056, Bug
18291345)" into lmp-mr1-dev
Evan Charlton [Wed, 3 Dec 2014 18:09:30 +0000 (18:09 +0000)]
Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
Nancy Chen [Wed, 3 Dec 2014 18:05:56 +0000 (18:05 +0000)]
Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev
Sailesh Nepal [Tue, 2 Dec 2014 23:18:25 +0000 (15:18 -0800)]
Re-add Connection.getCallCapabilities
This method wasn't supposed to be removed.
Bug:
18594044
Bug:
18292176
Change-Id: Iac4cc0972643a8271957e480d3f48d50243af271
Paul Jensen [Wed, 3 Dec 2014 18:04:27 +0000 (18:04 +0000)]
Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 18:04:22 +0000 (18:04 +0000)]
Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
Dianne Hackborn [Wed, 3 Dec 2014 18:03:25 +0000 (18:03 +0000)]
Merge "Work on issue #
18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev
Dianne Hackborn [Wed, 3 Dec 2014 02:32:20 +0000 (18:32 -0800)]
Work on issue #
18572506: AppOps in-memory state is invalid after...
...uninstalling updates to a system app
Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.
Also introduce more features to the appops command, which are useful
for testing this.
Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
Trevor Johns [Wed, 3 Dec 2014 17:30:27 +0000 (17:30 +0000)]
am
512103d6: am
19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
* commit '
512103d62d932c882ff0c233787be1a902518585':
Docs: Add "admin" to samples categories
Trevor Johns [Wed, 3 Dec 2014 17:20:52 +0000 (17:20 +0000)]
am
19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
* commit '
192754842cab0db73f2c1a4f9f78bfe37a84ce0d':
Docs: Add "admin" to samples categories
Adrian Roos [Wed, 3 Dec 2014 17:19:35 +0000 (17:19 +0000)]
am
f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev
* commit '
f235edf21532c63f149ad8653a76558fba087f3e':
Refresh user list a little more eagerly
Svetoslav [Wed, 3 Dec 2014 17:19:29 +0000 (17:19 +0000)]
am
4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev
* commit '
4667d247bbff30d7fe47a4022b91eb03da17be4d':
Inconsistent media sizes for es-US locale.
Jason Monk [Wed, 3 Dec 2014 17:19:24 +0000 (17:19 +0000)]
am
8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev
* commit '
8d72046b9ba06feadbcf71815a1c6e1017c8da37':
Don't show no sim icon on wifi devices
Daniel Sandler [Wed, 3 Dec 2014 17:19:19 +0000 (17:19 +0000)]
am
195c4388: Fixing bugs in the LLand.
* commit '
195c438883dfcca799aa456dfe52d24c077e40da':
Fixing bugs in the LLand.
Jinsuk Kim [Wed, 3 Dec 2014 17:19:14 +0000 (17:19 +0000)]
am
3f6755f5: CEC: Check command type for power status monitor action
* commit '
3f6755f58722bbae532171c384a294e530864ae1':
CEC: Check command type for power status monitor action
Craig Mautner [Wed, 3 Dec 2014 17:19:01 +0000 (17:19 +0000)]
am
dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev
* commit '
dad92f3668c8f153b4be946bed32c338c5fb6317':
Don't process windows belonging to unshown users
OSDN Git Service
