OSDN Git Service
Felipe Leme [Fri, 10 Jun 2016 19:58:44 +0000 (19:58 +0000)]
Merge \"Check for valid paths when getVolumeList() returns invisible volumes.\" into nyc-dev
am:
6da2fb61ce
Change-Id: I57e257307eb854d04f298eeefc8a55b55ee6ea78
TreeHugger Robot [Fri, 10 Jun 2016 19:38:49 +0000 (19:38 +0000)]
Merge "Check for valid paths when getVolumeList() returns invisible volumes." into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 18:09:11 +0000 (11:09 -0700)]
Check for valid paths when getVolumeList() returns invisible volumes.
The FLAG_INCLUDE_INVISIBLE was created to let SM.getStorageVolumes()
return mounted volumes (like USB drives), but in the current form it
might return invalid volumes. For example, when a SD Card is adopted as
an internal storage, it will return 2 volumes instead of one, the "bad"
one being:
VolumeInfo{emulated}:
type=EMULATED diskId=null partGuid=null mountFlags=0 mountUserId=-1
state=UNMOUNTED
fsType=null fsUuid=null fsLabel=null
path=null internalPath=null
As such, we need to filter out those volumes that don't have a path.
BUG:
29250241
Change-Id: I3f84b53eac98f31f918d843c70f9d42983e2a438
John Reck [Fri, 10 Jun 2016 18:02:20 +0000 (18:02 +0000)]
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am:
e4b1fb94e3
Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
Dianne Hackborn [Fri, 10 Jun 2016 17:49:59 +0000 (17:49 +0000)]
Merge \"Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format\" into nyc-dev
am:
9303ecb317
Change-Id: Ibbb8301975226ada197b2bf07970108a2faac005
John Reck [Fri, 10 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev
Dianne Hackborn [Fri, 10 Jun 2016 17:43:13 +0000 (17:43 +0000)]
Merge "Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format" into nyc-dev
Tianjie Xu [Fri, 10 Jun 2016 17:19:32 +0000 (17:19 +0000)]
Merge \"Collect statistics of source build version\" into nyc-dev
am:
8872a604b9
Change-Id: I42ceaa3033182e833afbb9d10c65f0d57a8f8591
Chong Zhang [Fri, 10 Jun 2016 17:19:29 +0000 (17:19 +0000)]
Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am:
792918e5fd
Change-Id: I4b004cee7f0cdf5ccf2f269e0b0aef8de2eb8741
Tianjie Xu [Fri, 10 Jun 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Collect statistics of source build version" into nyc-dev
Chong Zhang [Fri, 10 Jun 2016 17:06:08 +0000 (17:06 +0000)]
Merge "Use user id 0 to get missing appId for debugger" into nyc-dev
Chris Craik [Fri, 10 Jun 2016 16:08:38 +0000 (16:08 +0000)]
Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am:
4bcf66030d
Change-Id: I478d99bc0b1f1f10fef38505282711e95b7f5a09
TreeHugger Robot [Fri, 10 Jun 2016 16:03:20 +0000 (16:03 +0000)]
Merge "Fix framebuffer incomplete errors" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 02:21:50 +0000 (02:21 +0000)]
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am:
094c40b2cc
Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
TreeHugger Robot [Fri, 10 Jun 2016 02:12:22 +0000 (02:12 +0000)]
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 01:05:08 +0000 (01:05 +0000)]
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am:
d75bc225ac
Change-Id: I7341bb190830bead47af780e22d8ed9ee8819384
Adam Lesinski [Fri, 10 Jun 2016 00:53:43 +0000 (00:53 +0000)]
Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:46:19 +0000 (17:46 -0700)]
BatteryStats: Bump checkin format version to 18
Bug:
28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
Adam Lesinski [Wed, 8 Jun 2016 20:55:55 +0000 (13:55 -0700)]
BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.
Bug:
28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
Phil Weaver [Fri, 10 Jun 2016 00:16:36 +0000 (00:16 +0000)]
Merge \"Stop magnifying surface insets.\" into nyc-dev
am:
4663b4e806
Change-Id: I69d56ae38d9445f662ac3564788ad8da382594b6
Phil Weaver [Fri, 10 Jun 2016 00:08:21 +0000 (00:08 +0000)]
Merge "Stop magnifying surface insets." into nyc-dev
Chris Craik [Thu, 9 Jun 2016 23:57:11 +0000 (16:57 -0700)]
Fix framebuffer incomplete errors
bug:
29127615
Primarily fixes case where 0 dimensioned layers could be
created/updated. Additionally, adds more logging in incomplete
framebuffer cases, if they still occur.
Change-Id: Ib90dbbafd6905aca3c8f46e64064e13a308f713d
Dianne Hackborn [Thu, 9 Jun 2016 23:58:45 +0000 (16:58 -0700)]
Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format
Change-Id: I36d4e5e20ff2ed1b4d02a04390e0415b9b2394a3
Christopher Tate [Thu, 9 Jun 2016 23:51:02 +0000 (23:51 +0000)]
Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am:
9faaf5418a
Change-Id: I786bc8d21571fbe456d80b38789fd5e141b3182a
Phil Weaver [Thu, 9 Jun 2016 23:42:47 +0000 (23:42 +0000)]
Merge \"Improve accessibility window title behavior\" into nyc-dev
am:
f8af34365c
Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
Chong Zhang [Thu, 9 Jun 2016 23:15:27 +0000 (16:15 -0700)]
Use user id 0 to get missing appId for debugger
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.
This also revert commit
55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.
bug:
28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
Chris Tate [Thu, 9 Jun 2016 23:34:22 +0000 (23:34 +0000)]
Merge "Don't allow restore sessions during backups" into nyc-dev
Phil Weaver [Thu, 9 Jun 2016 23:32:09 +0000 (23:32 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 23:28:26 +0000 (16:28 -0700)]
Don't allow restore sessions during backups
Gracefully no-op if apps attempt to restore themselves while there is
a backup pass in flight.
Bug
29135379
Change-Id: I8f0b5cd9d149b703e1de7a3a0b4b54c3aff766b6
John Reck [Thu, 9 Jun 2016 23:26:21 +0000 (16:26 -0700)]
Don't call surfaceCreated for just changed surfaces
Fixes:
29223302
If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.
Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
Tianjie Xu [Wed, 8 Jun 2016 22:02:35 +0000 (15:02 -0700)]
Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/
1121141
Bug:
28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
Svet Ganov [Thu, 9 Jun 2016 22:51:54 +0000 (22:51 +0000)]
Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev
am:
c94872e940
Change-Id: Ie1e3e6f4e112e40983be6e65ad17ee6e8a5acb55
Svetoslav Ganov [Thu, 9 Jun 2016 22:44:50 +0000 (22:44 +0000)]
Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 22:26:36 +0000 (22:26 +0000)]
Merge "Settings: add logpersist selection (strings)" into nyc-dev-plus-aosp
Dianne Hackborn [Thu, 9 Jun 2016 22:22:00 +0000 (22:22 +0000)]
Merge \"Fix more of issue #
28689719: Runtime restart\" into nyc-dev
am:
4781525399
Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
Dianne Hackborn [Thu, 9 Jun 2016 22:16:26 +0000 (22:16 +0000)]
Merge "Fix more of issue #
28689719: Runtime restart" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 22:13:32 +0000 (22:13 +0000)]
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am:
52e323bd38
Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
Chris Tate [Thu, 9 Jun 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
Mark Salyzyn [Fri, 3 Jun 2016 21:05:05 +0000 (14:05 -0700)]
Settings: add logpersist selection (strings)
(cherry picked from commit
954ed57091a6471f1873c9954fbb16a4f65a25b5)
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug:
28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
Adam Lesinski [Thu, 9 Jun 2016 21:24:09 +0000 (21:24 +0000)]
Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am:
9e9c78f8ce
Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
Pavlin Radoslavov [Thu, 9 Jun 2016 21:19:29 +0000 (21:19 +0000)]
Merge \\"Unlock mBluetoothLock.readLock() instead of double-locking it\\" am:
4467c845c0
am:
2df165b8db
Change-Id: I89b60a4b78ea3221e7a880c558cd6fd591298d76
Pavlin Radoslavov [Thu, 9 Jun 2016 21:16:32 +0000 (21:16 +0000)]
Merge \"Unlock mBluetoothLock.readLock() instead of double-locking it\"
am:
4467c845c0
Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
TreeHugger Robot [Thu, 9 Jun 2016 21:16:01 +0000 (21:16 +0000)]
Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev
Treehugger Robot [Thu, 9 Jun 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"
Adam Powell [Thu, 9 Jun 2016 21:05:23 +0000 (21:05 +0000)]
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am:
7a37f8945f
Change-Id: I7f1b3f03d9e18fbfa732f2a96242f5f5966828ea
TreeHugger Robot [Thu, 9 Jun 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 20:44:48 +0000 (13:44 -0700)]
Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.
Bug
29220492
Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
Phil Weaver [Thu, 9 Jun 2016 17:24:53 +0000 (10:24 -0700)]
Improve accessibility window title behavior
Un-reverts ag/
1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.
Bug:
28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
Philip P. Moltmann [Thu, 9 Jun 2016 20:43:28 +0000 (20:43 +0000)]
Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
am:
142fc425c4
Change-Id: I5142e0a5c495933b87399cc0b62f1b881b04330e
Philip P. Moltmann [Thu, 9 Jun 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Cache resources needed to sort media sizes." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 20:33:52 +0000 (20:33 +0000)]
Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
am:
1a77efe9ba
Change-Id: I2b8b3f6dca4b545c770e4221f36f651fd9ca8d21
Andrii Kulian [Thu, 9 Jun 2016 20:27:28 +0000 (20:27 +0000)]
Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev
Pavlin Radoslavov [Thu, 9 Jun 2016 20:13:44 +0000 (20:13 +0000)]
Unlock mBluetoothLock.readLock() instead of double-locking it
am:
7ee53be300
Change-Id: I5c4a3baba14ab8a61d78981c6cbb5ccc797e4732
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
(cherry picked from commit
7ee53be300573c9bdc71607d32d4a642e4ad3dc8)
Dianne Hackborn [Wed, 8 Jun 2016 23:33:29 +0000 (16:33 -0700)]
Fix more of issue #
28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
Adam Lesinski [Thu, 9 Jun 2016 18:17:10 +0000 (11:17 -0700)]
ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.
Bug:
27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
Robert Carr [Thu, 9 Jun 2016 19:36:27 +0000 (19:36 +0000)]
Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am:
4624d687f7
Change-Id: I94fc4de5fd24f75b2b69f6380048d8e57ae7980e
Adam Powell [Thu, 9 Jun 2016 19:36:16 +0000 (12:36 -0700)]
Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.
Bug
28972438
Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
Philip P. Moltmann [Thu, 9 Jun 2016 19:31:57 +0000 (19:31 +0000)]
Merge \"Handling of Fuji Xerox in RecommendationService.\" into nyc-dev
am:
5398f2731b
Change-Id: I109284a897eba18ec57bd5f61cdade0fcde19a36
TreeHugger Robot [Thu, 9 Jun 2016 19:28:10 +0000 (19:28 +0000)]
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
Philip P. Moltmann [Thu, 9 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 00:20:44 +0000 (17:20 -0700)]
Don't update mTaskToReturnTo when task is cleared
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.
Bug:
28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
Eric Schmidt [Thu, 9 Jun 2016 18:02:19 +0000 (18:02 +0000)]
Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am:
e4b1149320 am:
2dea7d3836
am:
b1a99c46b6
Change-Id: I97b35a9519074face9851550b6e6c18300145624
Eric Schmidt [Thu, 9 Jun 2016 17:56:38 +0000 (17:56 +0000)]
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am:
e4b1149320
am:
2dea7d3836
Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
Eric Schmidt [Thu, 9 Jun 2016 17:45:53 +0000 (17:45 +0000)]
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am:
e4b1149320
Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
Eric Schmidt [Thu, 9 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "docs: Added links to performance resources section" into mnc-io-docs
Robert Carr [Fri, 3 Jun 2016 20:28:48 +0000 (13:28 -0700)]
PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.
Bug:
28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:26 +0000 (17:09 +0000)]
Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am:
396ed8d2cf am:
6e70538600
am:
e82ac10fa2
Change-Id: I984489411a4aceb62c495f861f18c130699ffe62
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:14 +0000 (17:09 +0000)]
Merge \\\"Remove duplicate the from AppBar documentation.\\\" into mnc-io-docs am:
f9f7a29fe9 am:
9bd21c0fbb
am:
9ac187304b
Change-Id: I5d1a08a1c8b69409fb5e7350582868f9cf383902
Aurimas Liutikas [Thu, 9 Jun 2016 17:09:05 +0000 (17:09 +0000)]
Merge \\\"Fix code example in testing-support-library.\\\" into mnc-io-docs am:
e172a4b692 am:
5b8233126d
am:
248eb25863
Change-Id: I28e1c06db8f2095dd2d8f05effac4fe2c7f4f974
Aurimas Liutikas [Thu, 9 Jun 2016 17:08:58 +0000 (17:08 +0000)]
Merge \\\"Fix a link to CustomTabsCallback in support-library docs.\\\" into mnc-io-docs am:
2ff2814a4a am:
5d75a24896
am:
d8b2c49475
Change-Id: I56ddae17078815ead1812bf598665e0f5c4ecc88
Aurimas Liutikas [Thu, 9 Jun 2016 16:57:02 +0000 (16:57 +0000)]
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am:
396ed8d2cf
am:
6e70538600
Change-Id: I0714693f2f19107d056be72944343c9636a0ff7e
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:58 +0000 (16:56 +0000)]
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am:
f9f7a29fe9
am:
9bd21c0fbb
Change-Id: Ib9c0255b772b0fc47d46758abdace1cf6bc9b045
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:54 +0000 (16:56 +0000)]
Merge \\"Fix code example in testing-support-library.\\" into mnc-io-docs am:
e172a4b692
am:
5b8233126d
Change-Id: Iee54ea9150f67b2595df3919ee06d307778d6666
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:50 +0000 (16:56 +0000)]
Merge \\"Fix a link to CustomTabsCallback in support-library docs.\\" into mnc-io-docs am:
2ff2814a4a
am:
5d75a24896
Change-Id: Iaa7fa74ba79eb4b6ea2bdc8274ab1498cb6b79f5
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:15 +0000 (16:45 +0000)]
Merge \"Correct the size of example bitmap for xxhdpi.\" into mnc-io-docs
am:
396ed8d2cf
Change-Id: Idb10cf41ebddc99613fcac41e9b6367c6e6b9e46
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:13 +0000 (16:45 +0000)]
Merge \"Remove duplicate the from AppBar documentation.\" into mnc-io-docs
am:
f9f7a29fe9
Change-Id: I7c79f4df131bbb7f2f5189af901cd75ac240c194
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:12 +0000 (16:45 +0000)]
Merge \"Fix code example in testing-support-library.\" into mnc-io-docs
am:
e172a4b692
Change-Id: I47e39e2a19289d12d1d54000c974ef9c1c97839a
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:10 +0000 (16:45 +0000)]
Merge \"Fix a link to CustomTabsCallback in support-library docs.\" into mnc-io-docs
am:
2ff2814a4a
Change-Id: Ic1b3b40336bc22503ac86aea96bd98b705adf96d
Aurimas Liutikas [Thu, 9 Jun 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Correct the size of example bitmap for xxhdpi." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:41:54 +0000 (16:41 +0000)]
Merge "Remove duplicate the from AppBar documentation." into mnc-io-docs
Philip P. Moltmann [Thu, 9 Jun 2016 16:39:55 +0000 (09:39 -0700)]
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug:
28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:25 +0000 (16:39 +0000)]
Merge "Fix code example in testing-support-library." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:14 +0000 (16:39 +0000)]
Merge "Fix a link to CustomTabsCallback in support-library docs." into mnc-io-docs
Jason Monk [Thu, 9 Jun 2016 15:33:41 +0000 (15:33 +0000)]
Merge \"QS: Fix crash when removing pages in RTL\" into nyc-dev
am:
9b5a780722
Change-Id: I81df6680e203af32d5cead8ab9340aff2a6fcaba
Xiaohui Chen [Thu, 9 Jun 2016 15:33:28 +0000 (15:33 +0000)]
Merge \"QS Detail: Fix up open/close animations\" into nyc-dev
am:
ac2e291832
Change-Id: I1ac6fae02a4946ca83fd466b815ec4788399d4d0
Jason Monk [Thu, 9 Jun 2016 15:25:00 +0000 (15:25 +0000)]
Merge "QS: Fix crash when removing pages in RTL" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 15:22:48 +0000 (15:22 +0000)]
Merge "QS Detail: Fix up open/close animations" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 14:22:05 +0000 (14:22 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
972b902171 -s ours
Change-Id: Ibcecebeb1286ecbc1529b428028a75c5b01de436
TreeHugger Robot [Thu, 9 Jun 2016 14:15:24 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 13:59:56 +0000 (09:59 -0400)]
QS: Fix crash when removing pages in RTL
Change-Id: Ic8f082a3dc61fbf12f576d4cffb8ab31e669cb7c
Fixes:
29122756
Bill Yi [Thu, 9 Jun 2016 13:57:15 +0000 (13:57 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
648c1112a6 -s ours
Change-Id: I495ab1285df32ffdbc39a03b6c2d94ccb8271622
TreeHugger Robot [Thu, 9 Jun 2016 13:51:09 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 12:39:26 +0000 (05:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: If53965a4f42f4c97334fc88250af6a72a9658b8a
Auto-generated-cl: translation import
Narayan Kamath [Thu, 9 Jun 2016 08:34:30 +0000 (08:34 +0000)]
PackageManagerService: fix NPE while renaming foreign dex markers.
am:
cf70a17a71
Change-Id: I565e13f9b6c74f3cbf0467527920549d2614d10d
Narayan Kamath [Tue, 7 Jun 2016 08:31:55 +0000 (09:31 +0100)]
PackageManagerService: fix NPE while renaming foreign dex markers.
The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.
bug:
29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2
Chad Brubaker [Thu, 9 Jun 2016 06:27:57 +0000 (06:27 +0000)]
Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am:
55cf361d83
Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
TreeHugger Robot [Thu, 9 Jun 2016 06:22:19 +0000 (06:22 +0000)]
Merge "Don't depend directly on AppplicationInfo" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 05:27:34 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
OSDN Git Service
