OSDN Git Service
Deepanshu Gupta [Sat, 10 Jan 2015 04:13:34 +0000 (04:13 +0000)]
am
cd2e4da9: am
20625cce: am
c5871ea1: am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
automerge:
2bc2a40
* commit '
2bc2a4064ae60c1448eaae112cf6f3df4d8f2daa':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:10:02 +0000 (04:10 +0000)]
am
cd2e4da9: am
20625cce: am
c5871ea1: am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
cd2e4da9a77396554b274cd79f64b37cadfac282':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:07:07 +0000 (04:07 +0000)]
am
b752d972: am
b3d418ad: am
db703ab6: am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
automerge:
789a992
* commit '
789a9926ad72b1e9349148db17f0b8631e37c74b':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 04:05:33 +0000 (04:05 +0000)]
am
b752d972: am
b3d418ad: am
db703ab6: am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
b752d9724871e1ede0d16a7af8f22b2d67bbe5d8':
LayoutLib: Fix System.arraycopy()
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: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: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()
Lajos Molnar [Sat, 10 Jan 2015 02:14:35 +0000 (02:14 +0000)]
am
d289a78c: am
7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly"
* commit '
d289a78c4745e219af493f59c5f174503685278d':
MediaCodec/Image: handle null cropRect correctly
Lajos Molnar [Sat, 10 Jan 2015 02:14:29 +0000 (02:14 +0000)]
am
f3694fc1: am
98840f2b: Merge "media: add support for 160-byte image info in MediaCodec"
* commit '
f3694fc139525ae45955087a0e4f15a15ed6e202':
media: add support for 160-byte image info in MediaCodec
Paul Jensen [Sat, 10 Jan 2015 02:08:59 +0000 (02:08 +0000)]
am
60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
automerge:
63e2b8e
* commit '
63e2b8e058f379582d0325aa84b5de6bfa73e15b':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
Paul Jensen [Sat, 10 Jan 2015 02:06:06 +0000 (02:06 +0000)]
am
60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '
60944390cde10c44064f1eda67eae5d76598f0d8':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
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:31:01 +0000 (01:31 +0000)]
am
6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
automerge:
b60bb35
* commit '
b60bb35650c7075bc66bf2b8f5c0fbe428092010':
MediaCodec: Added E-AC3 mime type (@hide).
Rachad [Sat, 10 Jan 2015 01:27:31 +0000 (01:27 +0000)]
am
6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
* commit '
6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66':
MediaCodec: Added E-AC3 mime type (@hide).
Lajos Molnar [Sat, 10 Jan 2015 01:26:02 +0000 (01:26 +0000)]
am
7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly"
* commit '
7f94b52fc7c66bc40702b46f59b3929c076cbbfb':
MediaCodec/Image: handle null cropRect correctly
Lajos Molnar [Sat, 10 Jan 2015 01:25:55 +0000 (01:25 +0000)]
am
98840f2b: Merge "media: add support for 160-byte image info in MediaCodec"
* commit '
98840f2bd2fb96225ed5c95644937d55d4189ca6':
media: add support for 160-byte image info in MediaCodec
Rachad [Sat, 10 Jan 2015 01:23:34 +0000 (01:23 +0000)]
Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
Ruben Brunk [Sat, 10 Jan 2015 01:19:45 +0000 (17:19 -0800)]
resolve merge conflicts of
0f647c1 to lmp-mr1-dev-plus-aosp.
Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
Lajos Molnar [Sat, 10 Jan 2015 01:12:31 +0000 (01:12 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly"
Lajos Molnar [Sat, 10 Jan 2015 01:10:23 +0000 (01:10 +0000)]
Merge "media: add support for 160-byte image info in MediaCodec"
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)
Ruben Brunk [Fri, 9 Jan 2015 23:37:07 +0000 (23:37 +0000)]
am
8c52d9a0: Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev
* commit '
8c52d9a092452837e7222d8416c3b4accf9a99d7':
Camera2: Fix early EOF in DngCreator#writeByteBuffer.
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
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
Christopher Tate [Fri, 9 Jan 2015 20:20:01 +0000 (20:20 +0000)]
am
a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
automerge:
68dabad
* commit '
68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
Exclude ephemeral networks from wifi backup
Christopher Tate [Fri, 9 Jan 2015 20:16:21 +0000 (20:16 +0000)]
am
a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
* commit '
a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
Exclude ephemeral networks from wifi backup
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:24:31 +0000 (19:24 +0000)]
am
2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
automerge:
0cb736f
* commit '
0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
Guard against MountService throwing NPE.
Jeff Sharkey [Fri, 9 Jan 2015 19:21:24 +0000 (19:21 +0000)]
am
2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
* commit '
2b46774ff950270365238e12e4a336e2004500e2':
Guard against MountService throwing NPE.
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:13:58 +0000 (19:13 +0000)]
Merge "Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge:
54f9b1e
automerge:
a319aa8
* commit '
a319aa800df36d40e1de453b64fd1e14573e6d80':
Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi
Dianne Hackborn [Fri, 9 Jan 2015 19:11:44 +0000 (19:11 +0000)]
Merge "Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge:
54f9b1e
* commit '
54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
Fix issue #
18942959: Phone getting stuck then restarts after unplugging from Audi
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
Ariel Gertzenstein [Fri, 9 Jan 2015 18:03:03 +0000 (18:03 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524" into lmp-mr1-dev automerge:
cce8db2
automerge:
b32831e
* commit '
b32831eebfd3c3ba2b26da18fef6818c12643f9d':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524
Ariel Gertzenstein [Fri, 9 Jan 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524" into lmp-mr1-dev
automerge:
cce8db2
* commit '
cce8db2c31a03d0c4e04f5851415d37032ae6621':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/
18922524
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 [Fri, 9 Jan 2015 15:13:52 +0000 (15:13 +0000)]
am
7f7ea82c: Profile owner hint in warning for extra CAs
automerge:
34f3ade
* commit '
34f3adedcc20b365361f40131347179152377954':
Profile owner hint in warning for extra CAs
Robin Lee [Fri, 9 Jan 2015 15:12:24 +0000 (15:12 +0000)]
am
7f7ea82c: Profile owner hint in warning for extra CAs
* commit '
7f7ea82c28f01798b15686aa45733885beebcc6e':
Profile owner hint in warning for extra CAs
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
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 01:39:02 +0000 (01:39 +0000)]
am
bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager.
automerge:
2db7977
* commit '
2db79771b6a92d9db6b670b000990d6a3398364d':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Shishir Agrawal [Fri, 9 Jan 2015 01:35:16 +0000 (01:35 +0000)]
am
bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager.
* commit '
bde7bc45af2bb7f9bee8096d45973f25cc00c5db':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Mathieu Chartier [Fri, 9 Jan 2015 00:28:33 +0000 (00:28 +0000)]
Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge:
9a6c45e
automerge:
117ba18
* commit '
117ba186d1d28ae7eb6d1187c795e502668fa9b4':
Call VMRuntime.clampGrowthLimit for small heap apps
Mathieu Chartier [Fri, 9 Jan 2015 00:20:53 +0000 (00:20 +0000)]
Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
automerge:
9a6c45e
* commit '
9a6c45eedd112313e5b24111f23bc309a3dc5df6':
Call VMRuntime.clampGrowthLimit for small heap apps
Mathieu Chartier [Fri, 9 Jan 2015 00:17:15 +0000 (00:17 +0000)]
Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
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
Mathieu Chartier [Thu, 8 Jan 2015 22:42:20 +0000 (14:42 -0800)]
Call VMRuntime.clampGrowthLimit for small heap apps
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.
Bug:
18387825
Bug:
17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
Robin Lee [Thu, 8 Jan 2015 22:39:39 +0000 (22:39 +0000)]
am
2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
automerge:
bc7efed
* commit '
bc7efed6941ddc63b399818608a4ec117b74af5f':
Revert "Profile owner hint in warning for extra CAs"
Robin Lee [Thu, 8 Jan 2015 22:38:22 +0000 (22:38 +0000)]
am
2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
* commit '
2cc617b2adcd3c54837a251b688e909e3224a5e4':
Revert "Profile owner hint in warning for extra CAs"
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:48:34 +0000 (21:48 +0000)]
am
cb8d8e10: Merge "Fix issue #
18827122: system server crashed on broadcasting..." into lmp-mr1-dev
automerge:
16e4324
* commit '
16e4324dd967d180f77fb25dbeea77229eaf0511':
Fix issue #
18827122: system server crashed on broadcasting...
Dianne Hackborn [Thu, 8 Jan 2015 21:46:53 +0000 (21:46 +0000)]
am
cb8d8e10: Merge "Fix issue #
18827122: system server crashed on broadcasting..." into lmp-mr1-dev
* commit '
cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
Fix issue #
18827122: system server crashed on broadcasting...
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:28:04 +0000 (20:28 +0000)]
am
31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev
automerge:
92160ba
* commit '
92160ba97dd2e54f6492b621452bbefe53f8285d':
Use NULL instead of 0 when invoking CallStaticVoidMethod
Lajos Molnar [Thu, 8 Jan 2015 20:24:33 +0000 (20:24 +0000)]
am
31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev
* commit '
31ef8ef5d0f98aa08b4c8247d1f252379d97a548':
Use NULL instead of 0 when invoking CallStaticVoidMethod
Adam Lesinski [Thu, 8 Jan 2015 20:24:33 +0000 (20:24 +0000)]
am
c04a21a0: Merge "Fixup aapt usage message" automerge:
64044d0
* commit '
c04a21a0ef6cd97a45307e4c1de9088e57719ca2':
Fixup aapt usage message
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
Adam Lesinski [Thu, 8 Jan 2015 20:18:38 +0000 (20:18 +0000)]
Merge "Fixup aapt usage message"
automerge:
64044d0
* commit '
64044d0b7bc9aa46c60adcadce699d556e1c608e':
Fixup aapt usage message
Adam Lesinski [Thu, 8 Jan 2015 20:15:38 +0000 (20:15 +0000)]
Merge "Fixup aapt usage message"
Craig Mautner [Thu, 8 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge:
62a32ee
automerge:
125b725
* commit '
125b725f46199b7058e437bb83f5d5179e1be73e':
Remove AppWindowTokens from exiting apps with task
Sanket Padawe [Thu, 8 Jan 2015 19:16:29 +0000 (19:16 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge:
d3b6956
automerge:
720b3a0
* commit '
720b3a04a499d1ed516a37a8eadade9c8fb15f51':
Removing DUN APN for Koodo CA (302-220)
Craig Mautner [Thu, 8 Jan 2015 19:13:38 +0000 (19:13 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev
automerge:
62a32ee
* commit '
62a32ee1dfff6921fd95c92068500af6b8b3f47e':
Remove AppWindowTokens from exiting apps with task
Sanket Padawe [Thu, 8 Jan 2015 19:12:28 +0000 (19:12 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev
automerge:
d3b6956
* commit '
d3b69567e3b6891574b8f06e3fc88ba91d4f7436':
Removing DUN APN for Koodo CA (302-220)
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:51:48 +0000 (18:51 +0000)]
am
9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
automerge:
bbadf11
* commit '
bbadf1161aacafd80182dda080534a123a7204ef':
NoMan: Cancel previous instance of ignored notification
Christoph Studer [Thu, 8 Jan 2015 18:49:53 +0000 (18:49 +0000)]
am
9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
* commit '
9d4b7963399045395799dcb7df5d8c84d9b12884':
NoMan: Cancel previous instance of ignored notification
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:37:43 +0000 (18:37 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge:
28a4cea -s ours
automerge:
7cd49c6 -s ours
* commit '
7cd49c6c3a2678510a278f28514c73dcbaae8957':
Fix pointer index out of range exception DO NOT MERGE
Craig Mautner [Thu, 8 Jan 2015 18:35:32 +0000 (18:35 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
automerge:
28a4cea -s ours
* commit '
28a4cea5a0f8d0e33b9d6a3283d31cc1e976c74c':
Fix pointer index out of range exception DO NOT MERGE
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:17:33 +0000 (18:17 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev automerge:
a7881fd
automerge:
30ae442
* commit '
30ae442133c55d4aa3636127de556736b2eaa99f':
Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
Dianne Hackborn [Thu, 8 Jan 2015 18:11:31 +0000 (18:11 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev
automerge:
a7881fd
* commit '
a7881fd30b973f923c98d53bddf397d744b4229c':
Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
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
Andres Morales [Thu, 8 Jan 2015 16:15:47 +0000 (16:15 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge:
d656955
automerge:
c9a7694
* commit '
c9a76941ecca457e6a17b06f557c24e18e3bdafa':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:13:17 +0000 (16:13 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
automerge:
d656955
* commit '
d656955efdd2e148d9390125b899e8fe2b677abd':
Wipe FRP partition if OEM unlock enabled
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:46:53 +0000 (10:46 +0000)]
resolved conflicts for merge of
36401a36 to lmp-mr1-dev-plus-aosp
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
Vladimir Marko [Thu, 8 Jan 2015 10:28:27 +0000 (10:28 +0000)]
am
e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev
* commit '
e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
Check for OOM in BitmapFactory's getMimeTypeString().
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:38:01 +0000 (04:38 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge:
c010c96
automerge:
d1646dc
* commit '
d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:32:40 +0000 (04:32 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
automerge:
c010c96
* commit '
c010c96fdf143b242c9795a71b231ccb4658b625':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
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:18:01 +0000 (04:18 +0000)]
am
62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge:
09d4e03
* commit '
62a1e753b1f73f575c978a377efdc531e7a86b8f':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:11:47 +0000 (04:11 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
automerge:
09d4e03
* commit '
09d4e03736caa1baf07256fc5cd6d61b264021a7':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
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