git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:32:43 +0000 (22:32 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865 am: e0481f0
am: e5116c2

* commit 'e5116c291039dbdfc028a212b02518d0c49b417b':
DO NOT MERGE Fix intent filter priorities

Change-Id: I7a48dd50d17e12343a6c79ba33739f727f29aae2

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:27:46 +0000 (22:27 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865
am: e0481f0

* commit 'e0481f0ee6321bd049ead42964dc7b4ecaf98754':
DO NOT MERGE Fix intent filter priorities

Change-Id: I8e1c54619278c261d952d6ed297a6a0f74b2724c

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:22:30 +0000 (22:22 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours
am: d73c865

* commit 'd73c865385e2177055962d1015530c48556fd9f8':
DO NOT MERGE Fix intent filter priorities

Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:17:19 +0000 (22:17 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7  -s ours am: ebb136c am: 6e0aff3
am: a73fa08  -s ours

* commit 'a73fa08457827b17a3db15ccaf52cb65a693d5db':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ie5c2a26cf1c6cc8f363845fb1be187fffc1a88fe

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:12:09 +0000 (22:12 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c
am: 6e0aff3

* commit '6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
DO NOT MERGE Fix intent filter priorities

Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:12:05 +0000 (22:12 +0000)]

DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e
am: bd770bc

* commit 'bd770bc97b7c4745c39d16ca417bd8ddedcaefcf':
DO NOT MERGE Fix intent filter priorities

Change-Id: I7c17baf18e2d25c95fb5b8fa45f5cc7b5936723b

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]

DO NOT MERGE Fix intent filter priorities am: eeb970a
am: cd24c4e

* commit 'cd24c4ebc0904342b5c9657c43dfa6c07c6e1eec':
DO NOT MERGE Fix intent filter priorities

Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]

DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours
am: ebb136c

* commit 'ebb136cbda0ba1caff3c482e00aff416edc5117f':
DO NOT MERGE Fix intent filter priorities

Change-Id: I20536d7bca605aadb8cec8bee5383e1aef9742c9

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:00:31 +0000 (22:00 +0000)]

DO NOT MERGE Fix intent filter priorities
am: d6174e7 -s ours

* commit 'd6174e74020aaec97db5780837a3edcd787018bf':
DO NOT MERGE Fix intent filter priorities

Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Apr 2016 22:00:26 +0000 (22:00 +0000)]

DO NOT MERGE Fix intent filter priorities
am: eeb970a

* commit 'eeb970ada10d37495ad7a8a4b14ad0506b640eea':
DO NOT MERGE Fix intent filter priorities

Change-Id: I22cfcc61e9ec37242e0e47ef732c9364bdb8a886

commit | commitdiff | tree

Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]

DO NOT MERGE Fix intent filter priorities

Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4

commit | commitdiff | tree

Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]

DO NOT MERGE Fix intent filter priorities

Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4

commit | commitdiff | tree

Sharvil Nanavati [Fri, 25 Mar 2016 20:18:05 +0000 (20:18 +0000)]

Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
am: a677ea7 -s ours

* commit 'a677ea72b159317ebb7456f60703babacef61650':
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.

commit | commitdiff | tree

Sharvil Nanavati [Fri, 25 Mar 2016 20:14:28 +0000 (20:14 +0000)]

Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev

commit | commitdiff | tree

Andriy Naborskyy [Thu, 24 Mar 2016 22:43:04 +0000 (22:43 +0000)]

Merge "bootanimation: implement split packaging of animation" into cw-e-dev
am: 9f68357

* commit '9f68357d5f71c263f2ff67736a0d2272cc840c32':
bootanimation: implement split packaging of animation

commit | commitdiff | tree

Andriy Naborskyy [Thu, 24 Mar 2016 22:03:19 +0000 (22:03 +0000)]

Merge "bootanimation: implement split packaging of animation" into cw-e-dev

commit | commitdiff | tree

Sharvil Nanavati [Mon, 21 Mar 2016 21:19:37 +0000 (14:19 -0700)]

DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.

Change-Id: I48c0a7bc39e2efcc5b4120a4fa2ecf6dfd54ac27

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 22:05:50 +0000 (22:05 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69 am: 1d508de
am: 3b2ed11

* commit '3b2ed11851f342f01bef3832e8603122698a3588':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:58:28 +0000 (21:58 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69
am: 1d508de

* commit '1d508decacf84e26db6164d30006166e0fc74f5f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:53:57 +0000 (21:53 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours
am: 1450b69

* commit '1450b69182fd9b360d9dd4ec54d431560eb775e6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:49:16 +0000 (21:49 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d  -s ours am: c2712ab am: 3253022
am: f4fd201  -s ours

* commit 'f4fd20168fdf1ee19da63cc82c0893a288d8b759':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:45:25 +0000 (21:45 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab
am: 3253022

* commit '325302206a0129bdf16a486232d5864d71e62a44':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:45:23 +0000 (21:45 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4 am: 542bb73
am: fbfd7d0

* commit 'fbfd7d0c91ef84d12ca036462b54794076d06cdc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:40:45 +0000 (21:40 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours
am: c2712ab

* commit 'c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:40:23 +0000 (21:40 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4
am: 542bb73

* commit '542bb7307b2bf3dab337b56e392b778896f88ec6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:35:32 +0000 (21:35 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings
am: d385a6d -s ours

* commit 'd385a6d95fc830ecc8d55937e9f46b14165d4b34':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Samuel Tan [Wed, 23 Mar 2016 21:35:30 +0000 (21:35 +0000)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings
am: d8c3ca4

* commit 'd8c3ca43163427a75c8b70114096238177f97af0':
[DO NOT MERGE] Disallow guest user from changing Wifi settings

commit | commitdiff | tree

Andriy Naborskyy [Mon, 17 Aug 2015 04:32:50 +0000 (21:32 -0700)]

bootanimation: implement split packaging of animation

Animation package zip can be separated into OEM and SYSTEM
OEM desc.txt can use new command "$SYSTEM" to invoke animation
from SYSTEM package

Changes to animation structure:
1. animation can refer other animation
2. animation contains zip file reference
3. BootAnimation has name of root of animation Zip; processing desc.txt we
need filename of container zip and we can't access it from ZipFileRO instance

movie() changes:
1. Split movie() into loading Zip and playing part
2. load parses desc.txt and if needed referred Zip
3. play can descend animations tree

Change-Id: I600d02c84d537df7b3e32a84f84a294b26e319e0
Signed-off-by: Andriy Naborskyy <andriyn@google.com>

commit | commitdiff | tree

Samuel Tan [Mon, 14 Mar 2016 22:57:02 +0000 (15:57 -0700)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings

Disallow existing and newly created guest users from
changing Wifi settings.

BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
settings are disabled.

Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3

commit | commitdiff | tree

Samuel Tan [Mon, 14 Mar 2016 22:57:02 +0000 (15:57 -0700)]

[DO NOT MERGE] Disallow guest user from changing Wifi settings

Disallow existing and newly created guest users from
changing Wifi settings.

BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
settings are disabled.

Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3

commit | commitdiff | tree

Tyler Gunn [Fri, 18 Mar 2016 01:34:27 +0000 (18:34 -0700)]

DO NOT MERGE Add new ConnectionEvent API (hide) to send a notification to Telecom

Connection event used to inform Telecom that it should play or stop
the on hold tone. This is used to play or stop a tone when the peer
puts the current call on hold.

BUG=25357778
Change-Id: I2669f8f5062449784a712b9dd28e576326fcc679

commit | commitdiff | tree

Pierre-Laurent Coirier [Wed, 2 Mar 2016 18:53:21 +0000 (18:53 +0000)]

Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev
am: 54c3808802

* commit '54c3808802e643785cc76b29067d1119e9c78af4':
Grant fixed SMS & Phone permission to package handling the twinning settings intent.

commit | commitdiff | tree

Pierre-Laurent Coirier [Wed, 2 Mar 2016 13:04:25 +0000 (13:04 +0000)]

Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev

commit | commitdiff | tree

Bryce Lee [Wed, 2 Mar 2016 03:12:09 +0000 (03:12 +0000)]

DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
am: 7c2539e2a5 -s ours

* commit '7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.

commit | commitdiff | tree

Bryce Lee [Mon, 29 Feb 2016 22:59:07 +0000 (14:59 -0800)]

DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.

Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.

Bug: 26451648
Change-Id: Ie209f08058205eea39513c03b626788f5fed3293
Signed-off-by: Bryce Lee <brycelee@google.com>

commit | commitdiff | tree

Pierre-Laurent Coirier [Fri, 26 Feb 2016 17:07:41 +0000 (12:07 -0500)]

Grant fixed SMS & Phone permission to package handling the twinning
settings intent.

BUG: 27343350
Change-Id: I818424e94006910dc25bab7cccb24f7979c39c9e

commit | commitdiff | tree

Joshua Schwarz [Thu, 25 Feb 2016 22:48:02 +0000 (22:48 +0000)]

Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
am: dcd0b05dc3

* commit 'dcd0b05dc35fb058f89a16d370bb7965b339c1c5':
Add Google Now intent so that it is discoverable to AppLaunch metrics.

commit | commitdiff | tree

Joshua Schwarz [Thu, 25 Feb 2016 22:45:20 +0000 (22:45 +0000)]

Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev

commit | commitdiff | tree

Joshua Schwarz [Wed, 24 Feb 2016 01:26:25 +0000 (17:26 -0800)]

Add Google Now intent so that it is discoverable to AppLaunch metrics.

Change-Id: I65ddce1499c3fa2ca54b815709270610a273e571

commit | commitdiff | tree

Andre Eisenbach [Wed, 24 Feb 2016 19:57:07 +0000 (19:57 +0000)]

resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
am: dfd4b8b25c

* commit 'dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

commit | commitdiff | tree

Andre Eisenbach [Wed, 24 Feb 2016 19:36:27 +0000 (11:36 -0800)]

resolve merge conflicts of e6c7c8e8f2 to cw-e-dev

Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f

commit | commitdiff | tree

Andre Eisenbach [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]

Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)" into mnc-dr-dev

commit | commitdiff | tree

Liejun Tao [Tue, 23 Feb 2016 22:00:37 +0000 (22:00 +0000)]

DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9
am: d46bd91531

* commit 'd46bd9153144f905138e0b609c3d8252a5d5505e':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

commit | commitdiff | tree

Liejun Tao [Tue, 23 Feb 2016 21:54:00 +0000 (21:54 +0000)]

DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
am: 9ef7634fa9

* commit '9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

commit | commitdiff | tree

Andre Eisenbach [Thu, 14 Jan 2016 22:20:34 +0000 (14:20 -0800)]

DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.

Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".

Bug: 26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)

commit | commitdiff | tree

Liejun Tao [Wed, 20 Jan 2016 23:52:20 +0000 (17:52 -0600)]

DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.

Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>

commit | commitdiff | tree

Akshay Thakker [Mon, 22 Feb 2016 22:46:59 +0000 (22:46 +0000)]

Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c99809
am: 768e1df375

* commit '768e1df37559c580ede46574bb1c583b0705375a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on

commit | commitdiff | tree

Akshay Thakker [Mon, 22 Feb 2016 22:39:53 +0000 (22:39 +0000)]

Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev
am: e210c99809

* commit 'e210c9980946b440bc6f7d57fef18c7fac223d3a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on

commit | commitdiff | tree

Akshay Thakker [Mon, 22 Feb 2016 22:27:24 +0000 (22:27 +0000)]

Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 19:44:19 +0000 (19:44 +0000)]

Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687  -s ours
am: ab4d629294  -s ours

* commit 'ab4d62929412556b90f8927fb05602d2e630518c':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 19:42:04 +0000 (19:42 +0000)]

Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8  -s ours
am: 83fd156e21  -s ours

* commit '83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 19:31:32 +0000 (19:31 +0000)]

Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
am: d201f48687 -s ours

* commit 'd201f486871e825e713ae0df2f2f01e3dfff94d8':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 19:27:18 +0000 (19:27 +0000)]

Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev
am: 3e439db8c8 -s ours

* commit '3e439db8c829023645a54eee4cd531928bccb03d':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 18:47:11 +0000 (18:47 +0000)]

Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev

commit | commitdiff | tree

Adam Lesinski [Mon, 22 Feb 2016 18:47:02 +0000 (18:47 +0000)]

Merge "DO NOT MERGE ANYWHERE: Don't change screen on time on time changes" into mnc-dr-dev

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 02:22:00 +0000 (02:22 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b am: 4aa78554df am: 20339172bd am: 20c518816a
am: 7f35fa7365

* commit '7f35fa7365b24f13f7553c452dc68f99fc7304ae':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 02:14:27 +0000 (02:14 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b am: 4aa78554df am: 20339172bd
am: 20c518816a

* commit '20c518816a0946dff67a3b99b929bc30c9b0ad6c':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 02:05:16 +0000 (02:05 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b am: 4aa78554df
am: 20339172bd

* commit '20339172bddac09730bf46f5eb289db4c299d64d':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 02:01:11 +0000 (02:01 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 am: 242bdb6d5b
am: 4aa78554df

* commit '4aa78554dfa1ff4cdb91ba560e3097d8febbe5c9':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 01:53:57 +0000 (01:53 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009
am: 242bdb6d5b

* commit '242bdb6d5bec6e42b7caf42fd08ded0accc70fb8':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 01:45:01 +0000 (01:45 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d
am: 5e4e02b009

* commit '5e4e02b00999db4513f43d5ddfdd2c71212cc503':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 01:37:34 +0000 (01:37 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1
am: 6fc321a66d

* commit '6fc321a66d74401e00b2203817f75e29a0426ab7':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 01:27:25 +0000 (01:27 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17
am: eec587edf1

* commit 'eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 01:01:10 +0000 (01:01 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05
am: 58048c1f17

* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 00:47:41 +0000 (00:47 +0000)]

NPE fix for SyncStorageEngine read authority am: a962d9eba7
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Sat, 20 Feb 2016 00:41:03 +0000 (00:41 +0000)]

NPE fix for SyncStorageEngine read authority
am: a962d9eba7

* commit 'a962d9eba7a8f741ed149964126fb08fe4fd7128':
NPE fix for SyncStorageEngine read authority

commit | commitdiff | tree

Shreyas Basarge [Thu, 18 Feb 2016 11:56:05 +0000 (11:56 +0000)]

NPE fix for SyncStorageEngine read authority

Add a null check after an authority is read
from disk.

Bug: 26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1

commit | commitdiff | tree

Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]

DO NOT MERGE ANYWHERE: Hack to get devices booting again.

If we try scheduling a pass before the system is ready, record a
pending event and dispatch once we're actually ready.

Bug: 26863668
Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc
(cherry picked from commit 538c11cf2175d4e30337e8776401bfede85866be)

commit | commitdiff | tree

Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7

commit | commitdiff | tree

Shreyas Basarge [Mon, 11 Jan 2016 15:43:54 +0000 (15:43 +0000)]

DO NOT MERGE Fix for syncs being dropped when appIdle is on

Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.

Bug: 26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
(cherry picked from commit 2c051498b2b0e2608740d906e70867b74083107d)

commit | commitdiff | tree

Amith Yamasani [Thu, 18 Feb 2016 22:21:32 +0000 (22:21 +0000)]

Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev am: 7a313a63ca
am: 6aff10d066 -s ours

* commit '6aff10d0662bc4c7e64a2e6d22f3606ef4dd1046':
DO NOT MERGE Check apps idle states on time changes

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 22:03:35 +0000 (22:03 +0000)]

DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am: 1559fed4c4  -s ours
am: 5c9378f310  -s ours

* commit '5c9378f310acd4ab375ed8a5d703a86522ab814c':
  DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 22:00:55 +0000 (22:00 +0000)]

DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am: 2bd90c6abc  -s ours
am: bca4317a3b  -s ours

* commit 'bca4317a3bbbdfdda083283d73a26e9c078c84f2':
  DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 21:59:39 +0000 (21:59 +0000)]

DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am: 9c7b543325  -s ours
am: 7e03454985  -s ours

* commit '7e0345498528611f538d8a5f259acc3440c1a649':
  DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time

commit | commitdiff | tree

Amith Yamasani [Thu, 18 Feb 2016 20:16:55 +0000 (20:16 +0000)]

Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev
am: 7a313a63ca

* commit '7a313a63cac7ae79699a6ea928af92429edd479b':
DO NOT MERGE Check apps idle states on time changes

commit | commitdiff | tree

Amith Yamasani [Thu, 18 Feb 2016 20:09:23 +0000 (20:09 +0000)]

Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 19:20:22 +0000 (19:20 +0000)]

DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
am: 1559fed4c4 -s ours

* commit '1559fed4c47a4bd219e61f7d34e50d46b8929f8a':
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 19:17:39 +0000 (19:17 +0000)]

DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
am: 2bd90c6abc -s ours

* commit '2bd90c6abce3e43af6db4eaa7a34459e8341b3a0':
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash

commit | commitdiff | tree

Adam Lesinski [Thu, 18 Feb 2016 19:15:16 +0000 (19:15 +0000)]

DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
am: 9c7b543325 -s ours

* commit '9c7b543325db1a6f8913403ec3a5cbe041b25043':
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time

commit | commitdiff | tree

Amith Yamasani [Fri, 22 Jan 2016 19:27:16 +0000 (11:27 -0800)]

DO NOT MERGE Check apps idle states on time changes

And ensure that the listeners are informed of app standby transitions
that might occur during time changes.

Fix for apps that sometimes don't have network access until reboot.

Bug: 26488100
Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
(cherry picked from commit c465e71cdc401e1565c29a895a5c6d366ba5344c)

commit | commitdiff | tree

Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]

DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle

Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090

commit | commitdiff | tree

Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]

DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash

With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.

Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:26504153

Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69

commit | commitdiff | tree

Adam Lesinski [Fri, 8 Jan 2016 02:24:53 +0000 (18:24 -0800)]

DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time

App Idle queries are very frequent and so they only check in memory stats.
However, in memory stats can be missing some entries, especially after a rollover, but also
due to a larger bug fixed in master (too risky to take now).

The fix is to do a deep query (reading older files from disk) and maintain a parallel cache
of stats for app idle. That way the rolling window of data required to serve app idle queries
stays in memory.

Bug:26355386
Change-Id: I6a29bbc25214f6a3c2f24c8c079936e66f99e42e

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:37:55 +0000 (22:37 +0000)]

Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5
am: a3798d7a92

* commit 'a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
Fix missing observer reply callbacks

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:36:51 +0000 (22:36 +0000)]

Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am: ae31e13ae8
am: eae2b8978f

* commit 'eae2b8978f8cfdedac9404bf4c653f3f9b51f6dd':
Exit getAllValidScorers early if not the primary.

commit | commitdiff | tree

Dan Sandler [Sun, 14 Feb 2016 22:35:39 +0000 (22:35 +0000)]

DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626
am: 4baa901205

* commit '4baa9012058c8366d39ed9d07fee0f6da0fd6e71':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:30:47 +0000 (22:30 +0000)]

Merge "Fix missing observer reply callbacks" into mnc-dr-dev
am: d1811e07d5

* commit 'd1811e07d5ee751cbdc37a3ff84e2e010ead7adf':
Fix missing observer reply callbacks

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:27:20 +0000 (22:27 +0000)]

Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
am: ae31e13ae8

* commit 'ae31e13ae8785c627ac781a565fa41bc982cfb99':
Exit getAllValidScorers early if not the primary.

commit | commitdiff | tree

Dan Sandler [Sun, 14 Feb 2016 22:25:09 +0000 (22:25 +0000)]

DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
am: e79c73d626

* commit 'e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:23:53 +0000 (22:23 +0000)]

Merge "Fix missing observer reply callbacks" into mnc-dr-dev

commit | commitdiff | tree

Akshay Thakker [Sun, 14 Feb 2016 22:17:31 +0000 (22:17 +0000)]

Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev

commit | commitdiff | tree

Amith Yamasani [Fri, 20 Nov 2015 17:44:08 +0000 (09:44 -0800)]

Fix missing observer reply callbacks

This was causing upto 2 seconds in user switching delay.

Bug: 25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc

commit | commitdiff | tree

Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]

Exit getAllValidScorers early if not the primary.

This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.

BUG: 23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
(cherry picked from commit 5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76)

commit | commitdiff | tree

Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]

DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.

Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.

Bug: 26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
(cherry picked from commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0)

commit | commitdiff | tree

Hall Liu [Thu, 11 Feb 2016 18:16:08 +0000 (18:16 +0000)]

Merge "Initialize MD5 in logging in background" into cw-e-dev
am: 5839e7804c

* commit '5839e7804c717f3b398fd777540e2297e8c85300':
Initialize MD5 in logging in background

commit | commitdiff | tree

Hall Liu [Thu, 11 Feb 2016 18:10:31 +0000 (18:10 +0000)]

Merge "Initialize MD5 in logging in background" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Feb 2016 14:01:06 +0000 (09:01 -0500)]

Import translations. DO NOT MERGE

Change-Id: I25a7f71ae61c1e6dc0539fc88b2cdbadb6f99eed
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Feb 2016 14:02:38 +0000 (09:02 -0500)]

Import translations. DO NOT MERGE

Change-Id: I7356ebc23a9842b6594df301f204d79dfcd97bca
Auto-generated-cl: translation import

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:28:10 +0000 (18:28 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev
am: e2c27eede5 -s ours

* commit 'e2c27eede562241423c02d086703b12d4b3dddd3':
DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.

commit | commitdiff | tree

Wei Liu [Thu, 4 Feb 2016 18:23:59 +0000 (18:23 +0000)]

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.