OSDN Git Service
Jinsuk Kim [Wed, 14 Jan 2015 22:00:28 +0000 (07:00 +0900)]
CEC: Support sendStandby() for MHL device
Changed so that the API sendStandby() transform the request to
a MHL subcommand if the call is done against a MHL device.
Also hooked up the dump() to print out information on MHL.
Bug:
18451257
Change-Id: I1927855e0e4c45a731f0fd97ba572bfc2a894557
Alan Viverette [Tue, 13 Jan 2015 00:14:02 +0000 (16:14 -0800)]
Update docs for Window.setElevation(), apply changes immediately
BUG:
18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
Ricardo Cervera [Mon, 12 Jan 2015 22:16:09 +0000 (22:16 +0000)]
am
eec6dd77: am
a87f3555: am
d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit '
eec6dd779ca170a80ff457828e2687da834d2c1f':
docs: Add parent calls to WatchFaces snippet.
Wale Ogunwale [Mon, 12 Jan 2015 22:03:49 +0000 (22:03 +0000)]
Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev
Wale Ogunwale [Mon, 12 Jan 2015 18:24:36 +0000 (10:24 -0800)]
Don't allow windows with invalid types to be added.
Bug:
18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
Ricardo Cervera [Mon, 12 Jan 2015 21:59:33 +0000 (21:59 +0000)]
am
a87f3555: am
d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit '
a87f35555d4aca13902a334691815cfa462feb30':
docs: Add parent calls to WatchFaces snippet.
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am
d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit '
d8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
docs: Add parent calls to WatchFaces snippet.
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:39:24 +0000 (21:39 +0000)]
am
0bb84bb5: am
661ca547: am
8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
* commit '
0bb84bb5e2a137475718e31fb25f06b160163588':
docs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 21:34:19 +0000 (21:34 +0000)]
am
661ca547: am
8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
* commit '
661ca54706c146697fe45dfcf81840c25b9022b2':
docs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 21:31:02 +0000 (21:31 +0000)]
am
acd5f3ab: am
1946978c: am
76110e7c: docs: Remove Wear preview reference docs
* commit '
acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
docs: Remove Wear preview reference docs
Joe Fernandez [Mon, 12 Jan 2015 21:27:24 +0000 (21:27 +0000)]
am
8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
* commit '
8062f1f34113f4d73d37ebb57245342cca9d8f9c':
docs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 21:25:42 +0000 (21:25 +0000)]
am
1946978c: am
76110e7c: docs: Remove Wear preview reference docs
* commit '
1946978c5341fe06db287a4535769ea12e6b6745':
docs: Remove Wear preview reference docs
Joe Fernandez [Mon, 12 Jan 2015 21:23:16 +0000 (21:23 +0000)]
Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:16:26 +0000 (21:16 +0000)]
am
76110e7c: docs: Remove Wear preview reference docs
* commit '
76110e7c46297a221d8f2c92fbaef46b6f405294':
docs: Remove Wear preview reference docs
Jason Monk [Mon, 12 Jan 2015 21:00:08 +0000 (21:00 +0000)]
Merge "Carrier text handle sim removal" into lmp-mr1-dev
Ricardo Cervera [Mon, 12 Jan 2015 20:54:32 +0000 (12:54 -0800)]
docs: Add parent calls to WatchFaces snippet.
Bug:
18982021
Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
Prashant Malani [Mon, 12 Jan 2015 18:34:44 +0000 (18:34 +0000)]
Merge "Improve the circularMask for round displays" into lmp-mr1-dev
Joe Fernandez [Mon, 12 Jan 2015 18:28:03 +0000 (10:28 -0800)]
docs: Remove Wear preview reference docs
These docs are out of date and unreachable due to redirect rules.
Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
Joe Fernandez [Mon, 12 Jan 2015 18:20:41 +0000 (10:20 -0800)]
docs: Removing obsolete L-Preview docs and images
- /preview/images/
- TV Preview index pages
- Notifications preview page
Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
Eric Gilmore [Mon, 12 Jan 2015 17:19:05 +0000 (17:19 +0000)]
am
3fca2e7f: am
10b829e1: am
fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
* commit '
3fca2e7fee3d657c74406f8405bc1d669b9392e8':
Adding Android Fundamentals video.
Eric Gilmore [Mon, 12 Jan 2015 17:13:14 +0000 (17:13 +0000)]
am
10b829e1: am
fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
* commit '
10b829e126482c54657371485ecf425b3f05bb0f':
Adding Android Fundamentals video.
Eric Gilmore [Mon, 12 Jan 2015 17:07:12 +0000 (17:07 +0000)]
am
fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
* commit '
fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
Adding Android Fundamentals video.
Eric Gilmore [Mon, 12 Jan 2015 17:02:30 +0000 (17:02 +0000)]
Merge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 16:55:40 +0000 (16:55 +0000)]
am
2c7e5631: am
7862ba29: am
6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
* commit '
2c7e563181405ae6a91edb57f654f884b8759c8e':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Eric Gilmore [Mon, 12 Jan 2015 16:46:35 +0000 (16:46 +0000)]
am
7862ba29: am
6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
* commit '
7862ba297f7106ef0208e8f1dbbe9f9e35c63485':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Eric Gilmore [Mon, 12 Jan 2015 16:26:43 +0000 (16:26 +0000)]
am
6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
* commit '
6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Geoff Mendal [Mon, 12 Jan 2015 16:05:50 +0000 (08:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58457a1543f87145ae4a2c3292e49465939f715d
Auto-generated-cl: translation import
Eric Laurent [Mon, 12 Jan 2015 15:39:43 +0000 (15:39 +0000)]
Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev
Jason Monk [Mon, 12 Jan 2015 14:01:03 +0000 (14:01 +0000)]
Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev
Etan Cohen [Sun, 11 Jan 2015 19:10:20 +0000 (19:10 +0000)]
Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
Jinsuk Kim [Sat, 10 Jan 2015 21:59:37 +0000 (21:59 +0000)]
Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:28 +0000 (10:19 +0000)]
am
aadcdef3: am
191d06b5: am
74147527: am
8505c387: Special case AppCompat to show action bar. automerge:
bb600de automerge:
8d9361a
* commit '
aadcdef312bac520e5352d687a642a87faf3c654':
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:24 +0000 (10:19 +0000)]
am
686160b8: am
74e00d22: Support Locale.toLanguageTag on Java 6 automerge:
dbd64f7 automerge:
7da2b5d
* commit '
686160b854e845b79f74a526b397bb6dc438392b':
Deepanshu Gupta [Sat, 10 Jan 2015 10:19:20 +0000 (10:19 +0000)]
am
7aafa4fd: am
38884a30: LayoutLib: Fix System.arraycopy() automerge:
51fb775 automerge:
55c7bd4
* commit '
7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:04 +0000 (10:13 +0000)]
am
191d06b5: am
74147527: am
8505c387: Special case AppCompat to show action bar. automerge:
bb600de automerge:
8d9361a
* commit '
191d06b55598b653e0764638ca37d8618c9d085e':
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:00 +0000 (10:13 +0000)]
am
74e00d22: Support Locale.toLanguageTag on Java 6 automerge:
dbd64f7 automerge:
7da2b5d
* commit '
74e00d229b5e4fca4bffd94373d58f94a74255d5':
Deepanshu Gupta [Sat, 10 Jan 2015 10:12:56 +0000 (10:12 +0000)]
am
38884a30: LayoutLib: Fix System.arraycopy() automerge:
51fb775 automerge:
55c7bd4
* commit '
38884a30dfe0fffce0c6097fd9d406e45d04aea5':
Deepanshu Gupta [Sat, 10 Jan 2015 09:49:53 +0000 (09:49 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar. automerge:
bb600de
automerge:
8d9361a
* commit '
8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':
Deepanshu Gupta [Sat, 10 Jan 2015 09:48:39 +0000 (09:48 +0000)]
Support Locale.toLanguageTag on Java 6 automerge:
dbd64f7
automerge:
7da2b5d
* commit '
7da2b5dbc259ef026bb075905f9fda3695dd4615':
Deepanshu Gupta [Sat, 10 Jan 2015 09:47:08 +0000 (09:47 +0000)]
LayoutLib: Fix System.arraycopy() automerge:
51fb775
automerge:
55c7bd4
* commit '
55c7bd4dac3078ab220823e522c9257246933c46':
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
automerge:
bb600de
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge:
dbd64f7
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge:
51fb775
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Etan Cohen [Wed, 26 Nov 2014 19:56:53 +0000 (11:56 -0800)]
Added configuration to determine whether VoLTE requires provisioning.
Bug:
18576107
Change-Id: I08c231a3d876f3fe92c0fcb7f52be878b2da00dd
Deepanshu Gupta [Sat, 10 Jan 2015 04:04:22 +0000 (04:04 +0000)]
am
c598047d: am
ca67a249: am
bb600de6: am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
c598047d67f64e690f682d82c0e77989c79ae465':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:04:18 +0000 (04:04 +0000)]
am
20625cce: am
c5871ea1: am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
20625cce4c13d2337456aaa74ba91b6c4379321f':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:59:58 +0000 (03:59 +0000)]
am
b3d418ad: am
db703ab6: am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
b3d418ad027c324c1169e7087689a81bfefdf7f3':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:47 +0000 (03:56 +0000)]
am
ca67a249: am
bb600de6: am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
ca67a249293d021808f349fa2e2f799451aeafe8':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:44 +0000 (03:56 +0000)]
am
c5871ea1: am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
c5871ea1b830153e7f85367844bcc67b81a2c06b':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:52:05 +0000 (03:52 +0000)]
am
db703ab6: am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
db703ab64643ef91bbdb989a04597ecf7d0ca928':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:05 +0000 (03:51 +0000)]
am
bb600de6: am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:01 +0000 (03:51 +0000)]
am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:43:48 +0000 (03:43 +0000)]
am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am
8505c387: Special case AppCompat to show action bar.
* commit '
8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
Paul Jensen [Sat, 10 Jan 2015 01:59:43 +0000 (01:59 +0000)]
Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit
5cd9dde5a2a77c5095f985186d8f03147fd22870)
Rachad [Sat, 10 Jan 2015 01:23:34 +0000 (01:23 +0000)]
Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.
Note that this was already being done for char.
Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit
e1960cc0b541cda93db94de5bef42dff922b9ec3)
Deepanshu Gupta [Fri, 9 Jan 2015 03:10:07 +0000 (19:10 -0800)]
Special case AppCompat to show action bar.
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
Ruben Brunk [Fri, 9 Jan 2015 23:33:46 +0000 (23:33 +0000)]
Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev
Eric Laurent [Fri, 9 Jan 2015 23:09:40 +0000 (15:09 -0800)]
AudioService: send connection intent for HDMI ARC device
Bug:
18921279.
Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
Eric Gilmore [Fri, 9 Jan 2015 22:42:46 +0000 (22:42 +0000)]
Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
Ruben Brunk [Fri, 9 Jan 2015 21:48:31 +0000 (13:48 -0800)]
Camera2: Fix early EOF in DngCreator#writeByteBuffer.
Bug:
18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
Eric Gilmore [Tue, 6 Jan 2015 17:30:30 +0000 (09:30 -0800)]
Adding Android Fundamentals video.
Bug:
18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474
Jason Monk [Fri, 9 Jan 2015 21:07:14 +0000 (16:07 -0500)]
Carrier text handle sim removal
Have KeyguardUpdateMonitor send the onRefreshCarrierInfo when the
subscription info changes, regardless of whether there are any
subscriptions (because there might be no sims).
Bug:
18752587
Change-Id: I8976c76aae9e3e633b6adace48dccb1e940dbc18
Christopher Tate [Fri, 9 Jan 2015 20:10:20 +0000 (20:10 +0000)]
Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
Jeff Sharkey [Fri, 9 Jan 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
Dianne Hackborn [Fri, 9 Jan 2015 19:08:49 +0000 (19:08 +0000)]
Merge "Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
Prashant Malani [Thu, 8 Jan 2015 02:30:27 +0000 (18:30 -0800)]
Improve the circularMask for round displays
The mask was earlier drawn as a thin ring at the display periphery.
This had undesirable effects when screenshots were taken, as the ring
was seen, as well as display content beyond it.
This patch modifies the mask to be a black canvas with portions erased
to improve the screenshot image.
Bug:
18772987
Change-Id: I25ef6387879613354308e015446fe325ed8c4515
Ariel Gertzenstein [Fri, 9 Jan 2015 17:56:10 +0000 (17:56 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524" into lmp-mr1-dev
Dianne Hackborn [Fri, 9 Jan 2015 17:54:06 +0000 (09:54 -0800)]
Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.
Also:
- Improve error reporting of SystemConfig to tell you which config
file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
to ProcessRecord to print on demand.
Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
Ariel Gertzenstein [Fri, 9 Jan 2015 17:45:40 +0000 (17:45 +0000)]
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524
This reverts commit
bde7bc45af2bb7f9bee8096d45973f25cc00c5db.
Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
Robin Lee [Thu, 8 Jan 2015 22:46:44 +0000 (22:46 +0000)]
Profile owner hint in warning for extra CAs
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.
Bug:
18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
Jinsuk Kim [Thu, 8 Jan 2015 23:55:41 +0000 (08:55 +0900)]
CEC: Keep Playback device awake while it is the active source
Alleviates the user experience issue of having to turn on the device
manually when it goes to standby mode while the device occupies
the display.
Bug:
18882764
Change-Id: I10b239a599a310e47e3c2cb98737e4b0fdb4e435
Christopher Tate [Thu, 8 Jan 2015 20:50:00 +0000 (12:50 -0800)]
Exclude ephemeral networks from wifi backup
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager. The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.
Bug
18917753
Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
Shishir Agrawal [Fri, 9 Jan 2015 00:04:24 +0000 (16:04 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa
Robin Lee [Thu, 8 Jan 2015 22:31:35 +0000 (22:31 +0000)]
Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
Robin Lee [Thu, 8 Jan 2015 22:07:41 +0000 (22:07 +0000)]
Revert "Profile owner hint in warning for extra CAs"
This reverts commit
e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.
Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.
Bug:
18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
Jeff Sharkey [Thu, 8 Jan 2015 22:00:13 +0000 (14:00 -0800)]
Guard against MountService throwing NPE.
Fall through to below logic and return null instead of crashing the
entire app. We already tell developers the value may be null.
Bug:
17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
Dianne Hackborn [Thu, 8 Jan 2015 21:41:34 +0000 (21:41 +0000)]
Merge "Fix issue #
18827122: system server crashed on broadcasting..." into lmp-mr1-dev
Lajos Molnar [Thu, 8 Jan 2015 20:18:59 +0000 (20:18 +0000)]
Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev
Craig Mautner [Thu, 8 Jan 2015 19:09:40 +0000 (19:09 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev
Haitao Feng [Wed, 31 Dec 2014 05:48:08 +0000 (13:48 +0800)]
Use NULL instead of 0 when invoking CallStaticVoidMethod
static void CallStaticVoidMethod is variable argument function.
if pass 0 to the function like: CallStaticVoidMethod(......, 0),
0 will be treated as INT data type.but in the CallStaticVoidMethod
implement 0 will be treated as pointer data type.Pointer in 64bit
system occupied 8 bytes, but in 64bit system int occupied 4 bytes.
if call function like: CallStaticVoidMethod(......, 0),
only low 4 bytes will be assigned 0.Turned out it actually call
function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000).
intent to pass NULL to function but passed non-NULL parameter to
the function.this will cause GCDaemon crash.
Bug:
18911458
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
Sanket Padawe [Thu, 8 Jan 2015 19:08:08 +0000 (19:08 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 19:05:43 +0000 (11:05 -0800)]
Removing DUN APN for Koodo CA (302-220)
Bug:
18813997
Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec
Dianne Hackborn [Thu, 8 Jan 2015 18:37:05 +0000 (10:37 -0800)]
Fix issue #
18827122: system server crashed on broadcasting...
...an intent with invalid or null package uri
Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.
Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
Craig Mautner [Thu, 8 Jan 2015 18:56:00 +0000 (10:56 -0800)]
Remove AppWindowTokens from exiting apps with task
When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.
Fixes bug
18943737.
Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507
Christoph Studer [Thu, 8 Jan 2015 18:44:21 +0000 (18:44 +0000)]
Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
Craig Mautner [Thu, 8 Jan 2015 18:34:00 +0000 (18:34 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
Dianne Hackborn [Thu, 8 Jan 2015 18:08:12 +0000 (18:08 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev
Jason Monk [Thu, 8 Jan 2015 16:12:39 +0000 (11:12 -0500)]
Avoid showing emergency calls when not possible
Tablets aren't phones, so we shouldn't be showing an emergency calls
only message when in airplane mode or no sims are in them.
Bug:
18897573
Change-Id: I8cf31fe73dfd6dfd672a5ee58524815475a76c9c
Andres Morales [Thu, 8 Jan 2015 16:10:25 +0000 (16:10 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
Fix pointer index out of range exception DO NOT MERGE
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.
Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Fixes bug
18883936
Paul Jensen [Thu, 8 Jan 2015 15:49:34 +0000 (10:49 -0500)]
Remember to cancel lingering when a network again satsifies a NetworkRequest.
When WiFi's score drops and then comes back up we would previously linger
WiFi but forget to cancel the linger timeout, so 30s later WiFi would
unexpectedly tear down. This was not completely fixed in
0cc1732.
bug:
18826162
Change-Id: I7bb4b99ec969099e9815f46d4c09253be71a29be
Vladimir Marko [Thu, 8 Jan 2015 10:24:48 +0000 (10:24 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev
Bryce Lee [Thu, 8 Jan 2015 04:30:12 +0000 (04:30 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
Jinsuk Kim [Thu, 8 Jan 2015 04:08:52 +0000 (04:08 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
Jinsuk Kim [Wed, 7 Jan 2015 07:45:14 +0000 (16:45 +0900)]
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.
Bug:
18896770
Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea