OSDN Git Service
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.
TaskRecord task may be set to null when no resumed activity remain.
Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.
The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.
Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.
To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.
Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.
Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.
Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
In commit
08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
- CONFIG_MCC = 0x0001,
- CONFIG_MNC = 0x0002,
+ CONFIG_MCC = ACONFIGURATION_MCC,
+ CONFIG_MNC = ACONFIGURATION_MCC,
This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.
Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Jesse Hall [Sun, 15 Dec 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fix incorrect name in eglSwapBuffers log wrapper"
Kenny Root [Fri, 13 Dec 2013 22:12:52 +0000 (22:12 +0000)]
Merge "Use java.util.Objects instead on internal API"
Kenny Root [Fri, 13 Dec 2013 20:00:26 +0000 (12:00 -0800)]
Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.
Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
Narayan Kamath [Thu, 12 Dec 2013 16:54:33 +0000 (16:54 +0000)]
Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.
bug:
10193060
(cherry picked from commit
eb565dc527eda8c0a43df0d1f30132638ca4ba20)
Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
Kristian Monsen [Fri, 13 Dec 2013 06:32:03 +0000 (06:32 +0000)]
Merge "Fix one and hide the other warnings from core/jni"
Kenny Root [Fri, 13 Dec 2013 01:08:26 +0000 (01:08 +0000)]
Merge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 00:37:45 +0000 (16:37 -0800)]
Add GCMParameterSpec to preloaded-classes
Needed for Bouncycastle 1.50 upgrade with art.
Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c
Kristian Monsen [Thu, 12 Dec 2013 03:46:41 +0000 (19:46 -0800)]
Fix one and hide the other warnings from core/jni
Most of the warnings are unused parameter from skia functions.
Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072
Nick Kralevich [Wed, 11 Dec 2013 21:46:08 +0000 (21:46 +0000)]
Merge "Don't try to set service.bootanim.exit"
Nick Kralevich [Wed, 11 Dec 2013 21:10:55 +0000 (13:10 -0800)]
Don't try to set service.bootanim.exit
init has never allowed the bootanimation code to
set service.bootanim.exit, and has always generated the
dmesg error message
<3>[ 17.644615] init: sys_prop: permission denied uid:1003 name:service.bootanim.exit
Since setting this property has no effect and never worked, delete
the code which tries to do it.
Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
Marco Nelissen [Wed, 11 Dec 2013 18:07:50 +0000 (18:07 +0000)]
Merge "Parse UUID string with Long.parseLong"
Narayan Kamath [Wed, 11 Dec 2013 17:36:20 +0000 (17:36 +0000)]
Merge "Add libutils dependency for libandroidfw host build."
Narayan Kamath [Wed, 11 Dec 2013 16:48:07 +0000 (16:48 +0000)]
Add libutils dependency for libandroidfw host build.
Change-Id: I7fe0bb466f0b1cdbfef8934da2231ad20f05b648
Narayan Kamath [Wed, 11 Dec 2013 11:41:10 +0000 (11:41 +0000)]
Merge "Reimplement ZipFileRO in terms of libziparchive."
Elliott Hughes [Wed, 11 Dec 2013 01:29:27 +0000 (01:29 +0000)]
Merge "fix possible buffer overrun and memory leak"
Brian Harris [Tue, 10 Dec 2013 23:23:51 +0000 (15:23 -0800)]
Fix incorrect name in eglSwapBuffers log wrapper
Correctly identify eglSwapBuffers in EGLLogWrapper, which had been
labeled as "eglInitialize".
Change-Id: I67c61e100e2f84400ceebc28712f036e5a055017
Ashok Bhat [Thu, 28 Nov 2013 10:56:06 +0000 (10:56 +0000)]
AArch64: Use long for pointers in MediaDrm and MediaMuxer
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.
Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Tue, 10 Dec 2013 09:30:56 +0000 (09:30 +0000)]
Merge "Fix inconsistency in LoggingPrintStream."
Mathieu Chartier [Tue, 10 Dec 2013 02:13:51 +0000 (02:13 +0000)]
Merge "Update Dalvik process state through VMRuntime."
Kenny Root [Mon, 9 Dec 2013 22:28:59 +0000 (22:28 +0000)]
Merge changes Ib4450c39,Ie7ed5655
* changes:
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
Kenny Root [Mon, 9 Dec 2013 22:01:54 +0000 (14:01 -0800)]
preloaded-classes: remove some OpenSSLCipher modes
Some cipher modes were removed from OpenSSLCipher. This change removes
those classes from the preloaded classes list.
Change-Id: Ib4450c392513973836684b4d5df7fffb200b6260
Kenny Root [Mon, 9 Dec 2013 21:49:27 +0000 (13:49 -0800)]
Add CertStoreParameters to preloaded-classes
For image creating, art needs this in the preloaded-classes list.
Otherwise it complains loudly about not being able to load it from a
class initializer in Provider.java.
Change-Id: Ie7ed5655cba038b504767c3de9f70b47a8965cce
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug:
10193060
Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
Narayan Kamath [Mon, 9 Dec 2013 11:09:21 +0000 (11:09 +0000)]
Fix inconsistency in LoggingPrintStream.
LoggingPrintStream prints "null" for null strings from
print(String) but throws an NPE from println(String).
Fix this by delegating to the underlying builder (and avoiding
the "fast" path when the input String == null)
bug: https://code.google.com/p/android/issues/detail?id=63380
Change-Id: I89c5c12db6ed5af8037d46f67369b38c5b4cbc9f
Lorenzo Colitti [Sat, 7 Dec 2013 02:43:02 +0000 (02:43 +0000)]
Merge "Add address flags and scope to LinkAddress."
Tom Marshall [Fri, 6 Dec 2013 20:04:25 +0000 (21:04 +0100)]
Parse UUID string with Long.parseLong
Integer.parseInt throws an NPE for values greater than 0x7fffffff.
Nick Kralevich [Fri, 6 Dec 2013 16:17:23 +0000 (08:17 -0800)]
am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
f7422885a99c5d240f70c2f8227ae44abeea3e5c':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:13:58 +0000 (16:13 +0000)]
Merge "Augment SELinuxMMAC functionality."
Robert Craig [Mon, 2 Dec 2013 15:24:23 +0000 (10:24 -0500)]
Augment SELinuxMMAC functionality.
* No longer support a package name stanza outside of
a signature tag. Package names, by themselves, have
no security associated with them in Android and thus we
should not be allowing or encouraging this
type of policy.
* Allow for nested package name stanzas inside
signature stanzas. There are cases where a finer
distinction needs to be made among apps signed with
the same cert. New code allows a different seinfo
tag to be assigned to the listed package names
signed by the parent cert. When a determination needs
to be made concerning seinfo assignments, the inner
seinfo tag takes precedence over the outer seinfo
labels which are assigned to just the signature.
* Temp structures are now used to parse new policy files
until the entire xml file is parsed and deemed correct,
at which time the temp structures are copied over to the
permanent class structures. This ensures that any structural
errors with the policy will not result in partial loads.
* Valid stanzas look like the following with the inner
package piece being optional.
<signer signature="">
<seinfo value=""/>
<package name="">
<seinfo value=""/>
</package>
<signer>
<default>
<seinfo value=""/>
</default>
Change-Id: Ia204d71211776dcf9b2dcc86ad6d77c4ad39dc25
Lorenzo Colitti [Fri, 15 Nov 2013 09:43:52 +0000 (18:43 +0900)]
Add address flags and scope to LinkAddress.
This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.
1. Add flags and scope to the class and update the unit test.
Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
Since most callers don't know about flags and scope, provide
constructors that default the flags to zero and determine the
scope from the address. Addresses notified by the kernel will
have these properly set. Make multicast addresses invalid.
Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
address and prefix information between two LinkAddress
objects. This is necessary because an interface can't have
two addresses with the same address/prefix but different
flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
to identify existing addresses to add/remove using
isSameAddressAs instead of implicit equals(). Specifically:
- If addLinkAddress is called with an address that is already
present, the existing address's flags and scope are updated.
This allows, for example, an address on an interface to go
from preferred to deprecated when it expires, without it
having to be removed and re-added.
- If removeLinkAddress is called with an address that is
present but with different flags, it deletes that address
instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
notification methods to take just a LinkAddress instead of
LinkAddress, flags, and scope. While I'm at it, change the
order of the arguments for consistency with the other
functions in the interface.
Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
The Android Open Source Project [Thu, 5 Dec 2013 21:10:46 +0000 (13:10 -0800)]
Merge commit '
bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
Ying Wang [Thu, 5 Dec 2013 19:13:20 +0000 (19:13 +0000)]
Merge "wifi: Remove obsolete libwpa_client library"
Dmitry Shmidt [Fri, 22 Nov 2013 23:50:23 +0000 (15:50 -0800)]
wifi: Remove obsolete libwpa_client library
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Thu, 5 Dec 2013 17:39:59 +0000 (17:39 +0000)]
Merge "libcore_to_document and junit_to_document are no longer functions."
Brian Carlstrom [Thu, 5 Dec 2013 06:20:48 +0000 (06:20 +0000)]
Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
Mathieu Chartier [Thu, 5 Dec 2013 01:32:43 +0000 (17:32 -0800)]
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.
Bug:
11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
John Huang [Thu, 5 Dec 2013 00:59:35 +0000 (00:59 +0000)]
Merge "RIL changes for supporting generic SIM communication."
Ying Wang [Thu, 5 Dec 2013 00:01:06 +0000 (16:01 -0800)]
libcore_to_document and junit_to_document are no longer functions.
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184
Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
Lorenzo Colitti [Wed, 4 Dec 2013 01:21:07 +0000 (01:21 +0000)]
Merge "Minor changes to LinkAddress."
Lorenzo Colitti [Wed, 27 Nov 2013 06:03:10 +0000 (15:03 +0900)]
Minor changes to LinkAddress.
1. Simplify the parceling code. Since the InetAddress inside a
LinkAddress can never be null, we don't need to special-case
the case where it is.
2. Add / update method documentation.
3. Write a unit test.
Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
Mathieu Chartier [Mon, 2 Dec 2013 23:53:10 +0000 (23:53 +0000)]
Merge "Add dalvik.vm.gctype to enable switching between different GCs."
Mathieu Chartier [Mon, 2 Dec 2013 23:46:51 +0000 (15:46 -0800)]
Add dalvik.vm.gctype to enable switching between different GCs.
The option passes the specified GC type into the Xgc runtime
option.
Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.
Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
Nick Kralevich [Mon, 2 Dec 2013 20:00:28 +0000 (20:00 +0000)]
Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
Stephen Smalley [Mon, 2 Dec 2013 19:38:31 +0000 (14:38 -0500)]
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
It never worked anyhow, at least in AOSP, as nothing checks that property,
and is pointless now that enforcing mode is set by init.
Change-Id: If05dd49963c5d7081e00039b5e378032bea0939b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Shishir Agrawal [Thu, 28 Nov 2013 00:26:20 +0000 (16:26 -0800)]
RIL changes for supporting generic SIM communication.
Adds the 4 new commands to RIL interface:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
Lorenzo Colitti [Wed, 27 Nov 2013 00:52:41 +0000 (00:52 +0000)]
Merge "Use LinkAddress in address notifications."
Jason Sams [Tue, 26 Nov 2013 20:23:44 +0000 (20:23 +0000)]
Merge "Adding operations to reflected Renderscript class"
Dan Sandler [Tue, 26 Nov 2013 15:27:33 +0000 (15:27 +0000)]
Merge "Keep PhoneStatusBar default constructor around."
John Spurlock [Mon, 23 Sep 2013 15:15:11 +0000 (11:15 -0400)]
Keep PhoneStatusBar default constructor around.
By keeping the entire class safe.
Cherry picked because the device will otherwise be unusable
if compiled with proguard 4.10.
(cherry picked from commit
af568530203dc2ee59f5fda4895d28b29dd92226)
Change-Id: I0b880f382101f737511bc6db96c604f43ed8d266
Lorenzo Colitti [Sun, 17 Nov 2013 06:05:02 +0000 (15:05 +0900)]
Use LinkAddress in address notifications.
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.
This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.
Bug:
9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e
Mathieu Chartier [Thu, 18 Jul 2013 17:58:01 +0000 (10:58 -0700)]
Update Dalvik process state through VMRuntime.
We now update Dalvik's process state through VMRuntime when the
process state changes in ActivityThread. This is used to determine
when to do trimming and will be used to determine when to do
compaction in the near future.
Bug:
8981901
Change-Id: I5eea272ba4ec2d1ed789b058d6457cb3c1fcf777
Lorenzo Colitti [Tue, 26 Nov 2013 01:03:05 +0000 (01:03 +0000)]
Merge "Pass DNS server info notifications to observers."
Lorenzo Colitti [Tue, 26 Nov 2013 01:02:30 +0000 (01:02 +0000)]
Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
Lorenzo Colitti [Tue, 26 Nov 2013 01:02:13 +0000 (01:02 +0000)]
Merge "Use BaseNetworkObserver in Tethering."
Lorenzo Colitti [Thu, 31 Oct 2013 02:59:46 +0000 (11:59 +0900)]
Pass DNS server info notifications to observers.
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.
[Cherry-pick of
416740ad4d9132005a71dc0883334e852235a18a]
Bug:
9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
Lorenzo Colitti [Mon, 4 Nov 2013 08:44:09 +0000 (17:44 +0900)]
Minor cleanups to NetdCallbackReceiver.onEvent.
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.
[Cherry-pick of
59be800e7fe81842aa8c77b91319f58ab165983d]
Bug:
9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228
Lorenzo Colitti [Thu, 31 Oct 2013 14:30:47 +0000 (23:30 +0900)]
Use BaseNetworkObserver in Tethering.
Tethering currently inherits from the AIDL interface
INetworkManagementEventObserver, so it has to provide no-op
implementations of all the interface's methods. Inherit from
BaseNetworkObserver and get rid of the no-ops.
[Cherry-pick of
f4e90eac87bc31611ddd80c46fc924d35ce66c1c]
Bug:
9180552
Change-Id: I74859b0d77951005651aaaa418185857e40eeedb
The Android Open Source Project [Fri, 22 Nov 2013 19:18:57 +0000 (11:18 -0800)]
Merge commit '
b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
Robert Greenwalt [Fri, 22 Nov 2013 02:02:00 +0000 (18:02 -0800)]
am
a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit '
a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
fix ethernet and wifi can't be tuned seperately issue
Robert Greenwalt [Fri, 22 Nov 2013 01:57:04 +0000 (01:57 +0000)]
Merge "fix ethernet and wifi can't be tuned seperately issue"
Craig Mautner [Thu, 21 Nov 2013 16:50:05 +0000 (08:50 -0800)]
am
0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '
0495f4eded46efd7035ed672dc933ec6430b93fd':
Make SurfaceView layers captured by screenshotApplications()
Craig Mautner [Thu, 21 Nov 2013 16:45:28 +0000 (16:45 +0000)]
Merge "Make SurfaceView layers captured by screenshotApplications()"
Sangkyu Lee [Thu, 21 Nov 2013 06:20:33 +0000 (15:20 +0900)]
Make SurfaceView layers captured by screenshotApplications()
Since SurfaceView layers are located below application layers,
SurfaceView is not captured by screenshotApplications()
when the application is running in fullscreen.
Moreover, ws.isFullscreen(dw, dh) returns mostly true
on the devices which do not use the navigation bar.
Change-Id: Ia1036c79054950384a97504714929fd85c8147de
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Adam Lesinski [Mon, 18 Nov 2013 21:32:42 +0000 (13:32 -0800)]
am
1abead42: am
245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
* commit '
1abead425c0e862e316e17521833a33d22e7a850':
Do not hold direct ref BatteryStatsImpl$Uid$Proc
Adam Lesinski [Mon, 18 Nov 2013 21:29:25 +0000 (13:29 -0800)]
am
245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
* commit '
245408d29018fee4b1231e52f5da1edcc3283c4a':
Do not hold direct ref BatteryStatsImpl$Uid$Proc
Adam Lesinski [Mon, 18 Nov 2013 21:26:32 +0000 (21:26 +0000)]
Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev
John Spurlock [Mon, 18 Nov 2013 20:56:25 +0000 (12:56 -0800)]
am
c65dfef3: am
afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
* commit '
c65dfef3f5ee07883446be0e6907f15fe457da9d':
Use scaled display size in wallpaper constraint.
John Spurlock [Mon, 18 Nov 2013 20:52:58 +0000 (12:52 -0800)]
am
afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
* commit '
afc76f28b93f931069bb58c4f9b524d5a99b1604':
Use scaled display size in wallpaper constraint.
John Spurlock [Mon, 18 Nov 2013 20:49:16 +0000 (20:49 +0000)]
Merge "Use scaled display size in wallpaper constraint." into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 20:23:26 +0000 (12:23 -0800)]
Do not hold direct ref BatteryStatsImpl$Uid$Proc
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.
bug:
11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
John Spurlock [Mon, 18 Nov 2013 19:14:49 +0000 (14:14 -0500)]
Use scaled display size in wallpaper constraint.
Bug:
11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
Baligh Uddin [Mon, 18 Nov 2013 18:56:21 +0000 (10:56 -0800)]
am
4dee4e1c: (-s ours) am
35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4dee4e1cb394b077174ee29656bde962502555de':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 18:56:17 +0000 (10:56 -0800)]
am
2cf27e71: (-s ours) am
d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 18:53:25 +0000 (10:53 -0800)]
am
35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
35fb6cdf14549dac07585ae791b27e2c069bf176':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 18:53:21 +0000 (10:53 -0800)]
am
d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d7b4052049cba6c793367f6b5a8c3837f06faf1e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 18:51:24 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:51:00 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:33:46 +0000 (10:33 -0800)]
am
a8a448da: am
e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit '
a8a448da25c62f54cac3318c17c69e851a4ecde9':
Fix NPE in ConnectivityService
Robert Greenwalt [Mon, 18 Nov 2013 18:29:51 +0000 (10:29 -0800)]
am
e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit '
e568672c9e57e1d7066e95ba547a1ae568409226':
Fix NPE in ConnectivityService
Robert Greenwalt [Mon, 18 Nov 2013 18:27:23 +0000 (18:27 +0000)]
Merge "Fix NPE in ConnectivityService" into klp-dev
Deepanshu Gupta [Mon, 18 Nov 2013 18:15:44 +0000 (10:15 -0800)]
am
ea04da7a: am
9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
* commit '
ea04da7a183b526cdc79366822e4fc794d28cbd2':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
Deepanshu Gupta [Mon, 18 Nov 2013 18:15:40 +0000 (10:15 -0800)]
am
42453ede: am
599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
* commit '
42453ede3335aa5f7007a5b36749e84df83a08d4':
Fix NPE in layoutlib. DO NOT MERGE
Deepanshu Gupta [Mon, 18 Nov 2013 18:11:50 +0000 (10:11 -0800)]
am
9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
* commit '
9570ed561296dd5a0753198706cde152b00f1b24':
Add libphonenumber to layoutlib.jar. DO NOT MERGE
Deepanshu Gupta [Mon, 18 Nov 2013 18:11:47 +0000 (10:11 -0800)]
am
599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
* commit '
599105a92ceb24f0f09beb11be18126ae4e8efdf':
Fix NPE in layoutlib. DO NOT MERGE
Deepanshu Gupta [Mon, 18 Nov 2013 18:08:09 +0000 (18:08 +0000)]
Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Mon, 18 Nov 2013 18:07:55 +0000 (18:07 +0000)]
Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 17:43:59 +0000 (09:43 -0800)]
Fix NPE in ConnectivityService
bug:
11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
Baligh Uddin [Mon, 18 Nov 2013 17:22:29 +0000 (09:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Nov 2013 16:49:48 +0000 (08:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Nov 2013 00:38:53 +0000 (16:38 -0800)]
am
253a352f: (-s ours) am
564fb1b8: (-s ours) Import translations. DO NOT MERGE
* commit '
253a352f8c351201781fe5e677ddc588b3527a95':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 00:35:05 +0000 (16:35 -0800)]
am
564fb1b8: (-s ours) Import translations. DO NOT MERGE
* commit '
564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 00:30:52 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8
Auto-generated-cl: translation import