OSDN Git Service
Android Build Merger (Role) [Fri, 6 May 2016 15:19:59 +0000 (15:19 +0000)]
Merge "Merge "Fix regression, show internal storage option..." into nyc-dev am:
9a76143ef5" into nyc-mr1-dev
Steve McKay [Fri, 6 May 2016 15:19:07 +0000 (15:19 +0000)]
Merge "Fix regression, show internal storage option..." into nyc-dev
am:
9a76143ef5
* commit '
9a76143ef550a547aefed81acbad5d380cc33393':
Fix regression, show internal storage option...
Change-Id: Iccbaa87826350a9ac10a0b852dc793bc222f20de
Puneet Kumar [Fri, 6 May 2016 15:17:35 +0000 (15:17 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev
Steve McKay [Fri, 6 May 2016 15:07:48 +0000 (15:07 +0000)]
Merge "Fix regression, show internal storage option..." into nyc-dev
Bill Yi [Fri, 6 May 2016 14:25:41 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
b8dd0c3786 -s ours
* commit '
b8dd0c378657efd04557a02f8e50cfa4b11ebc49':
Import translations. DO NOT MERGE
Change-Id: I4934f0aedb3027b13ba2ff793a39c9847fe35a40
Android Build Merger (Role) [Fri, 6 May 2016 14:20:03 +0000 (14:20 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
d9a4a6df9a -s ours" into nyc-mr1-dev
Bill Yi [Fri, 6 May 2016 14:19:37 +0000 (14:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
d9a4a6df9a -s ours
* commit '
d9a4a6df9aeb73579795adf942ab2ec72c0d3a67':
Import translations. DO NOT MERGE
Change-Id: I6772905351b855fcc0d2b7888c0ce08250ea83f6
TreeHugger Robot [Fri, 6 May 2016 14:15:29 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 6 May 2016 14:15:13 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 6 May 2016 14:13:11 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 6 May 2016 14:12:20 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 6 May 2016 14:12:03 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
David Brazdil [Fri, 6 May 2016 14:04:32 +0000 (14:04 +0000)]
Hide \'Optimizing apps\' dialog if not M->N upgrade
am:
ee057752cc
* commit '
ee057752cce759520e3ba7a022f8616504c12fa0':
Hide 'Optimizing apps' dialog if not M->N upgrade
Change-Id: I63e8184e42851a40ccb8d0df837dc96bf85eb8c5
David Brazdil [Wed, 27 Apr 2016 12:53:55 +0000 (13:53 +0100)]
Hide 'Optimizing apps' dialog if not M->N upgrade
Recent changes reduced the amount of time spent optimizing apps at
post-OTA boot. Instead of briefly showing the 'Optimizing apps'
dialog, we hide it completely.
The dialog is still shown for OTAs from a pre-N version of Android
since they can take a non-negligible amount of time (still much less
than in M).
Bug:
27350503
Change-Id: I5f6dae0c69799e1fc522f36453d2671b333bef0e
Ricky Wai [Fri, 6 May 2016 12:18:58 +0000 (12:18 +0000)]
Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev
am:
13532bdd2e
* commit '
13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
Fix enterprise contacts APIs naming and docs
Change-Id: I2305b72e0e3a1d5625d9016ffefed16fd7493c3e
Tony Mak [Fri, 6 May 2016 12:06:25 +0000 (12:06 +0000)]
Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev
Bill Yi [Fri, 6 May 2016 10:59:05 +0000 (03:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13bd96983d273f4a65e270689b83e5214ef0b25e
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 10:20:57 +0000 (03:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ccdef79879827db018c8ac8960a7eb830607e2b
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 10:13:32 +0000 (03:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I310e4c4effad31d6706d1a3260caa3bc2b6107f6
Auto-generated-cl: translation import
Glenn Kasten [Fri, 6 May 2016 06:22:05 +0000 (06:22 +0000)]
Merge "Update MIDI package summary am:
15a9a35bee am:
c1b551aba6 am:
fad0efcdb9" into nyc-dev
am:
06e066e9e1
* commit '
06e066e9e197e192155703061b235bf167b02a90':
Change-Id: Ife3e997a25b70d5a3c93165ec70a1ac956971334
Glenn Kasten [Fri, 6 May 2016 06:22:02 +0000 (06:22 +0000)]
Update MIDI package summary am:
15a9a35bee am:
c1b551aba6 am:
fad0efcdb9
am:
9bef3417c9
* commit '
9bef3417c930b773509c13008cf3b6152cc50e94':
Update MIDI package summary
Change-Id: I1708eb74df8d9281bc74d5f8752a67269b0f82f6
Android Build Merger (Role) [Fri, 6 May 2016 06:14:50 +0000 (06:14 +0000)]
Merge "Update MIDI package summary am:
15a9a35bee am:
c1b551aba6 am:
fad0efcdb9" into nyc-dev
Glenn Kasten [Fri, 6 May 2016 06:14:22 +0000 (06:14 +0000)]
Update MIDI package summary am:
15a9a35bee am:
c1b551aba6
am:
fad0efcdb9
* commit '
fad0efcdb96f87da9ded7474c4bfa67a6f221a88':
Update MIDI package summary
Change-Id: I98018736d395487e3e680bef7bbb770e61b54389
Glenn Kasten [Fri, 6 May 2016 06:12:13 +0000 (06:12 +0000)]
Update MIDI package summary am:
15a9a35bee am:
c1b551aba6
am:
fad0efcdb9
* commit '
fad0efcdb96f87da9ded7474c4bfa67a6f221a88':
Update MIDI package summary
Change-Id: Icb509b232ea816bb6305da6f38677d3cb6bea55e
Glenn Kasten [Fri, 6 May 2016 06:07:28 +0000 (06:07 +0000)]
Update MIDI package summary am:
15a9a35bee
am:
c1b551aba6
* commit '
c1b551aba6f760ac41bcaf4391c1ff861803de27':
Update MIDI package summary
Change-Id: Ic7a9920dc3f4a70f5f4eb718bc9f2dd00c1bbb7c
Glenn Kasten [Fri, 6 May 2016 06:02:44 +0000 (06:02 +0000)]
Update MIDI package summary
am:
15a9a35bee
* commit '
15a9a35beeebeed42335d9f51663daad932a64b2':
Update MIDI package summary
Change-Id: I3a86d68c14127e7969d300f77c10e0fe807cad72
Guang Zhu [Fri, 6 May 2016 04:56:17 +0000 (04:56 +0000)]
Merge "allow optionally skipping of initial launch" into nyc-dev
am:
2c7d670933
* commit '
2c7d670933e0e0f7f6a83c4353519511faaf4a2f':
allow optionally skipping of initial launch
Change-Id: I9621009ce4c3774368e974494c7f2beb4b2478f3
TreeHugger Robot [Fri, 6 May 2016 04:44:16 +0000 (04:44 +0000)]
Merge "allow optionally skipping of initial launch" into nyc-dev
Bill Yi [Fri, 6 May 2016 04:30:57 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d4745156fb9ddbff3d6af4564fa0a1754e1a384
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 04:28:01 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I15055663e1705ae0e64ca3f4242bbad3748461e4
Auto-generated-cl: translation import
Nathan Harold [Fri, 6 May 2016 03:31:30 +0000 (03:31 +0000)]
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
am:
08acd3ce28
* commit '
08acd3ce28ff34f5a49d693b4c1144d967208e67':
Coerce 8-bit bsic to Integer if Invalid
Change-Id: Ib1cf6ecce437c8198da169fd5a4f0d1301e1547e
Nathan Harold [Fri, 6 May 2016 03:31:28 +0000 (03:31 +0000)]
Merge "CellInfo Parceling for Invalid Values" into nyc-dev
am:
5b45c62a1a
* commit '
5b45c62a1a13801ed4c5fd228976928b30f63867':
CellInfo Parceling for Invalid Values
Change-Id: I049eabf4ede20f591fd193e133e62444c1185fb7
Nathan Harold [Fri, 6 May 2016 03:22:21 +0000 (03:22 +0000)]
Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
Nathan Harold [Fri, 6 May 2016 03:20:42 +0000 (03:20 +0000)]
Merge "CellInfo Parceling for Invalid Values" into nyc-dev
Guang Zhu [Fri, 6 May 2016 02:45:22 +0000 (19:45 -0700)]
allow optionally skipping of initial launch
Current harness performs one round of app launch as a "warm up", and
does not include that into final app launch time calculation. This
change skips this process so that it can speed up local test run
investigation.
Change-Id: I0b1948b2247d9f7e442e799d537508fba6dfa508
Dirk Dougherty [Fri, 6 May 2016 02:29:53 +0000 (02:29 +0000)]
Merge "Add vanity url for bg optimations." into mnc-mr-docs am:
d4c3473906 am:
4521e4e605 am:
631316a832
am:
61926ad85f
* commit '
61926ad85fdd9b3cb6444f2ac41a14b9680f98c6':
Add vanity url for bg optimations.
Change-Id: Ieca598b5a6260a9ec6fe03b13d32492230a4207c
Dirk Dougherty [Fri, 6 May 2016 02:24:40 +0000 (02:24 +0000)]
Merge "Add vanity url for bg optimations." into mnc-mr-docs am:
d4c3473906 am:
4521e4e605
am:
631316a832
* commit '
631316a83231bdd1089261c165b87a9fff08822a':
Add vanity url for bg optimations.
Change-Id: Iec34ba687fa442be88710e3f918be9fb721a9f11
Dirk Dougherty [Fri, 6 May 2016 02:19:49 +0000 (02:19 +0000)]
Merge "Add vanity url for bg optimations." into mnc-mr-docs am:
d4c3473906
am:
4521e4e605
* commit '
4521e4e60518b9c32948b2027822af8c30de8576':
Add vanity url for bg optimations.
Change-Id: Ic05784b96e79b0222f59f1f9ee07edf9bce447f6
Dirk Dougherty [Fri, 6 May 2016 02:15:15 +0000 (02:15 +0000)]
Merge "Add vanity url for bg optimations." into mnc-mr-docs
am:
d4c3473906
* commit '
d4c3473906ea86f9b18ffaa3856cb9d97fca139b':
Add vanity url for bg optimations.
Change-Id: I765f0c558ff2d74c536cbdf4c0fbdf29dd690fdb
Glenn Kasten [Fri, 6 May 2016 01:49:16 +0000 (18:49 -0700)]
Update MIDI package summary
Bug:
28625060
Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324
(cherry picked from commit
9a279ef267f194dd3f0b777da5a219b6ef04abac)
Dirk Dougherty [Fri, 6 May 2016 02:02:14 +0000 (02:02 +0000)]
Merge "Add vanity url for bg optimations." into mnc-mr-docs
Chris Craik [Fri, 6 May 2016 01:56:56 +0000 (01:56 +0000)]
Merge "Fix status bar background flicker" into nyc-dev
am:
d0fa4d3aaf
* commit '
d0fa4d3aafa42da696c006ab96a11ed54deec14c':
Fix status bar background flicker
Change-Id: I8cb0909f952aa0e8bf7705d753fd1bc0953187ba
Wale Ogunwale [Fri, 6 May 2016 01:51:47 +0000 (01:51 +0000)]
Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev
am:
3a94ec5617
* commit '
3a94ec56173170306b2304c858dbbeb99c3c93cc':
Fixed deadlock between AM and WM when animating pinned stack.
Change-Id: I51938073894ec18042a987645a424811213061ad
TreeHugger Robot [Fri, 6 May 2016 01:49:31 +0000 (01:49 +0000)]
Merge "Fix status bar background flicker" into nyc-dev
TreeHugger Robot [Fri, 6 May 2016 01:43:28 +0000 (01:43 +0000)]
Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev
Winson [Fri, 6 May 2016 00:46:44 +0000 (00:46 +0000)]
Fix edge case crash with invalid bitmap dimensions.
am:
f9e79e0499
* commit '
f9e79e0499a114b184e0d0f4dbd45b3d690a4657':
Fix edge case crash with invalid bitmap dimensions.
Change-Id: Id8464d81b228ff917226a7088ab9199b885c32c2
Winson [Thu, 5 May 2016 00:21:22 +0000 (17:21 -0700)]
Fix edge case crash with invalid bitmap dimensions.
- In these cases, skip returning an animation spec for that task
Bug:
28235453
Change-Id: I611dc4390c0cbd2ca5f16112e4784848b2d6896f
Wale Ogunwale [Thu, 5 May 2016 16:16:47 +0000 (09:16 -0700)]
Fixed deadlock between AM and WM when animating pinned stack.
In Ie18cc04ceeabd94093017f79676253e1189f5249 we delay ending the
pinned stack animation until app transition is done. However, the
signal that app transition is done comes in with the window manager
lock held and the we call into AM to do some additional work which
requires AM lock to be aquired. Since AM depends on WM we shouldn't
be holding the WM lock while calling into AM since AM can call into
WM with its lock held. We now post a runnable to finish the pinned
stack animation without the WM lock held.
Bug:
28564514
Change-Id: I8450123e992e569a74609883de810cdc611ced81
Adam Lesinski [Thu, 5 May 2016 23:35:28 +0000 (23:35 +0000)]
Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev
am:
c1ff12eccd
* commit '
c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
Fix issue where existing Activity Resources references would not update
Change-Id: I91cecfc1b5942d7e1c069e739be72a23472f6d47
Adam Lesinski [Thu, 5 May 2016 23:23:41 +0000 (23:23 +0000)]
Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev
Chris Craik [Thu, 5 May 2016 23:19:22 +0000 (16:19 -0700)]
Fix status bar background flicker
Fixes:
28533578
Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
Vladislav Kaznacheev [Thu, 5 May 2016 23:16:07 +0000 (23:16 +0000)]
Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
am:
7d2a0a0571
* commit '
7d2a0a05715841b582cbaefa3fd0e0a542064556':
Add @TestApi to ActivityOptions.setLaunchStackId
Change-Id: I7996b43fa80b5965feb69028be2526faa379a134
Adam Lesinski [Mon, 2 May 2016 23:09:16 +0000 (16:09 -0700)]
Fix issue where existing Activity Resources references would not update
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.
However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.
This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.
Bug:
27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
Nathan Harold [Thu, 5 May 2016 19:27:10 +0000 (12:27 -0700)]
Coerce 8-bit bsic to Integer if Invalid
Bug:
28299027
Change-Id: I1ff3314844991cf49cab6099a7a4c436980d52c9
Nathan Harold [Thu, 5 May 2016 18:12:27 +0000 (11:12 -0700)]
CellInfo Parceling for Invalid Values
Within CellInfo Fields, Integer.MAX_VALUE should indicate
that a field is not present in a report. This change makes the
invalid value consistent, and also ensures that it is checked
in the calculation of power levels / asu.
-Update parcel/unparcel functions to avoid -MAX_VALUE
-Update LTE and CDMA asuLevel() and level() functions to be
consistently aware of the possibility of incomplete information
Bug:
27946114
Change-Id: Iacdc85db894e4a7809da8b5dc759488a1b6321ea
Vladislav Kaznacheev [Thu, 5 May 2016 23:04:46 +0000 (23:04 +0000)]
Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
Christopher Tate [Thu, 5 May 2016 22:31:54 +0000 (22:31 +0000)]
Correct docs about what is ignored in full-data backup
am:
c5be8f8a4b
* commit '
c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
Correct docs about what is ignored in full-data backup
Change-Id: If70b6d247126758dcc82ec7780060ad99253a32d
Joe Onorato [Thu, 5 May 2016 22:21:49 +0000 (22:21 +0000)]
Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
am:
47384f90b4
* commit '
47384f90b4adb6dc4a005a7870e0ec6841042151':
Add the individual wakeup alarm counts to the batterystats checkin.
Change-Id: I86640737d6f188b6b00901937d498ce1148ec10f
Christopher Tate [Mon, 25 Apr 2016 21:41:50 +0000 (14:41 -0700)]
Correct docs about what is ignored in full-data backup
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.
Bug
28321431
Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
Joe Onorato [Thu, 5 May 2016 22:11:55 +0000 (22:11 +0000)]
Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
Yohei Yukawa [Thu, 5 May 2016 22:02:22 +0000 (22:02 +0000)]
Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
am:
9f76abc8ab
* commit '
9f76abc8ab9db3306c8061e9719dbe2a998031f3':
Fix stale InputMethodManager#mFullscreenMode.
Change-Id: I09eb284cb9a9b0dea96e3092a5f81ab894ee902b
Amith Yamasani [Thu, 5 May 2016 22:02:20 +0000 (22:02 +0000)]
Merge "Fix a regression in registering for package_removed" into nyc-dev
am:
7be089b74e
* commit '
7be089b74e4c8be473caa6fc2c2b0268c5e9d83c':
Fix a regression in registering for package_removed
Change-Id: Ic98eeddf9b1754b444a11531b2f762614751b111
Dianne Hackborn [Thu, 5 May 2016 22:02:18 +0000 (22:02 +0000)]
Merge "Fix issue #
28602068: Add count to job scheduler stats" into nyc-dev
am:
d90be6cccc
* commit '
d90be6cccca683e34566f5550ebb34f1c8e75b69':
Fix issue #
28602068: Add count to job scheduler stats
Change-Id: I60628c4c2150b51b34ad192bbca29bfd420e4b2f
Yohei Yukawa [Thu, 5 May 2016 21:55:48 +0000 (21:55 +0000)]
Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
TreeHugger Robot [Thu, 5 May 2016 21:54:16 +0000 (21:54 +0000)]
Merge "Fix a regression in registering for package_removed" into nyc-dev
Joe Onorato [Thu, 5 May 2016 21:46:15 +0000 (14:46 -0700)]
Add the individual wakeup alarm counts to the batterystats checkin.
Bug:
28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
Dianne Hackborn [Thu, 5 May 2016 21:53:21 +0000 (21:53 +0000)]
Merge "Fix issue #
28602068: Add count to job scheduler stats" into nyc-dev
Steve McKay [Wed, 4 May 2016 21:55:15 +0000 (14:55 -0700)]
Fix regression, show internal storage option...
...for non "Downloads" scenarios like "Copy to".
Bug:
28552420
Change-Id: If317e3f575a40cac69628c1b6eecfc6be1dfcbce
Jack Yu [Thu, 5 May 2016 21:00:47 +0000 (21:00 +0000)]
Merge "Added additional cbs channels support" into nyc-mr1-dev
Chris Craik [Thu, 5 May 2016 20:10:38 +0000 (20:10 +0000)]
Merge "Add layer tracing tags in new pipeline" into nyc-dev
am:
f8892359b0
* commit '
f8892359b0ae07031160a71cf3f7e3a86604c2b1':
Add layer tracing tags in new pipeline
Change-Id: I04a15d55b50f67dc808b63b4c95843bc38b48262
Jason Monk [Thu, 5 May 2016 20:01:56 +0000 (20:01 +0000)]
Merge "QS Edit: fix some move logic" into nyc-dev
am:
8e788d015c
* commit '
8e788d015cdb23077a9778e812f7de35819f8ed5':
QS Edit: fix some move logic
Change-Id: Ie32e34379d6bd2764ad523dab8bc6d25a251e670
TreeHugger Robot [Thu, 5 May 2016 19:57:06 +0000 (19:57 +0000)]
Merge "Add layer tracing tags in new pipeline" into nyc-dev
Jason Monk [Thu, 5 May 2016 19:51:54 +0000 (19:51 +0000)]
Merge "QS Edit: fix some move logic" into nyc-dev
Robert Carr [Thu, 5 May 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Prepare to replace windows across recreate()." into nyc-dev
am:
ea162c3c79
* commit '
ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
Prepare to replace windows across recreate().
Change-Id: If97dc53f59b5dbc7cb06c29e6aec9ff0fe52db76
Christopher Tate [Thu, 5 May 2016 19:47:29 +0000 (19:47 +0000)]
Merge "Ensure that the stream feeder doesn\'t hang in write..." into nyc-dev
am:
e2cdb20cf8
* commit '
e2cdb20cf895b15acac5acaa43e2e6ffb13655b8':
Ensure that the stream feeder doesn't hang in write...
Change-Id: I21efc9758b78df3092117ad30a044c1bf8d6a055
Amith Yamasani [Thu, 5 May 2016 19:38:17 +0000 (12:38 -0700)]
Fix a regression in registering for package_removed
Change-Id: I5d8bcc682f482d965cc9b76b5598a6521539272f
Fixes:
28616418 App is not removed from power whitelist when uninstalled
TreeHugger Robot [Thu, 5 May 2016 19:38:15 +0000 (19:38 +0000)]
Merge "Prepare to replace windows across recreate()." into nyc-dev
Chris Tate [Thu, 5 May 2016 19:35:37 +0000 (19:35 +0000)]
Merge "Ensure that the stream feeder doesn't hang in write..." into nyc-dev
Alan Viverette [Thu, 5 May 2016 18:54:38 +0000 (18:54 +0000)]
Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev
am:
3a3fb73c75
* commit '
3a3fb73c753efb2114693b1943246bc6c47f9470':
Revert "Always assign leftover pixels to last weighted child"
Change-Id: I221eb10696601ed4aff0f0876c07d3d9a24ff4de
Alan Viverette [Thu, 5 May 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev
shubang [Thu, 5 May 2016 18:32:06 +0000 (18:32 +0000)]
Merge "TIF: Keep recording sessions while changing user" into nyc-dev
am:
2bea394d14
* commit '
2bea394d14e6e7ae6a183d302d21ce1deacf4774':
TIF: Keep recording sessions while changing user
Change-Id: I08ebdc9e2ef7c48cc5156ad3238925116f0b4333
Makoto Onuki [Thu, 5 May 2016 18:32:03 +0000 (18:32 +0000)]
Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev
am:
8318223a6e
* commit '
8318223a6e2a8d5d8b39e0a81ce6fe09150ae100':
Fix reboot loop when "password to boot" is enabled on ...
Change-Id: I67dd6cdf9c905759c9994ef363b7cffc3d1450f1
Shubang Lu [Thu, 5 May 2016 18:20:12 +0000 (18:20 +0000)]
Merge "TIF: Keep recording sessions while changing user" into nyc-dev
Chris Thornton [Thu, 5 May 2016 18:19:39 +0000 (18:19 +0000)]
Merge "VIMS should only stop the keyphrases it started." into nyc-dev
am:
cac9495030
* commit '
cac94950301557eee97e3a961025ad76c3300dda':
VIMS should only stop the keyphrases it started.
Change-Id: I717b7a1053665e2fadb1d74e46000981c877d118
Youngsang Cho [Thu, 5 May 2016 18:19:35 +0000 (18:19 +0000)]
Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev
am:
00f8ee2851
* commit '
00f8ee28512aa1fd5afb67a61cb258c01e1bb802':
TIF: build TvInput list at onUnlockUser
Change-Id: If747026e36d5f67cc2da1745db128ca647692cfa
TreeHugger Robot [Thu, 5 May 2016 18:14:29 +0000 (18:14 +0000)]
Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev
Jeff Sharkey [Thu, 5 May 2016 18:09:39 +0000 (18:09 +0000)]
Merge "Track current user without calling into AMS." into nyc-dev
am:
90f4ca78ee
* commit '
90f4ca78ee714733dd90427085b496c906e83789':
Track current user without calling into AMS.
Change-Id: I71566f774f81cef5adbe9cfa0e92343795d9d1ad
Dirk Dougherty [Thu, 5 May 2016 18:05:47 +0000 (11:05 -0700)]
Add vanity url for bg optimations.
Change-Id: I34018b86a5da1abf6cf80427067d5b73eb1b2736
Chris Thornton [Thu, 5 May 2016 18:06:53 +0000 (18:06 +0000)]
Merge "VIMS should only stop the keyphrases it started." into nyc-dev
Youngsang Cho [Thu, 5 May 2016 18:06:19 +0000 (18:06 +0000)]
Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev
Jeff Sharkey [Thu, 5 May 2016 18:01:38 +0000 (18:01 +0000)]
Merge "Track current user without calling into AMS." into nyc-dev
Alan Viverette [Thu, 5 May 2016 17:52:10 +0000 (17:52 +0000)]
Revert "Always assign leftover pixels to last weighted child"
This reverts commit
cc26636f08da89f9750f550d66aa213f1ae24f7f.
Bug:
27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
Jeff Sharkey [Thu, 5 May 2016 17:45:01 +0000 (11:45 -0600)]
Track current user without calling into AMS.
From a layering point-of-view, StorageManager is below ActivityManager
and it shouldn't be calling upwards, since that risks locking
inversions. Instead, track the current user through the existing
SystemService callbacks.
Bug:
28598527
Change-Id: I02d3277eb26288d3b4e1897f4c9318a6288c9551
Fyodor Kupolov [Thu, 5 May 2016 17:14:49 +0000 (17:14 +0000)]
Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev
am:
430df0fdb6
* commit '
430df0fdb642847f1041756f94bf1483f7597f0c':
Return from onUserUnlocked if user is no longer unlocked
Change-Id: Iea5f3874a3992bfdf7d1e6b82f65856ed69d03fd
Jason Monk [Thu, 5 May 2016 15:24:21 +0000 (11:24 -0400)]
QS Edit: fix some move logic
Make sure its possible to add tiles when none are there and remove
tiles when all are added.
Bug:
28067638
Change-Id: Ia5a145f095cd33cf8d4a85a0a8aabb2344e3dec6
Fyodor Kupolov [Thu, 5 May 2016 17:10:44 +0000 (17:10 +0000)]
Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev
Jason Monk [Thu, 5 May 2016 17:07:09 +0000 (17:07 +0000)]
Merge "Add action to launch webview implementation settings" into nyc-dev
am:
c91f5e2971
* commit '
c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
Add action to launch webview implementation settings
Change-Id: If44add4529f88a1a5e051262d0c66ca447c12135
Makoto Onuki [Thu, 5 May 2016 17:03:09 +0000 (10:03 -0700)]
Fix reboot loop when "password to boot" is enabled on ...
a non english locale.
Bug
28607673
Change-Id: I316f348305238616e8254bb878b66099015a3793
shubang [Mon, 25 Apr 2016 18:21:42 +0000 (11:21 -0700)]
TIF: Keep recording sessions while changing user
Bug:
28302189
Change-Id: I3de400798b9ded5f9f67931fbe7033755d76902f
Jason Monk [Thu, 5 May 2016 16:56:18 +0000 (16:56 +0000)]
Merge "Add action to launch webview implementation settings" into nyc-dev
OSDN Git Service
