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

Paul Jensen [Thu, 26 May 2016 14:50:37 +0000 (14:50 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02
am: 7c625e1938

* commit '7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
Don't pass URL path and username/password to PAC scripts

Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 14:35:08 +0000 (14:35 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364
am: 75095e6f02

* commit '75095e6f02b13d070bb74b019ab6392f0f7b1105':
Don't pass URL path and username/password to PAC scripts

Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 14:13:16 +0000 (14:13 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434
am: 42a5983364

* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
Don't pass URL path and username/password to PAC scripts

Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 14:01:19 +0000 (14:01 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
am: 6c35cf2434

* commit '6c35cf2434ca373196b16620455f8f234b63d594':
Don't pass URL path and username/password to PAC scripts

Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 13:44:37 +0000 (13:44 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
am: bb27626141

* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
Don't pass URL path and username/password to PAC scripts

Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 13:37:24 +0000 (13:37 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
am: 8940d2b0ff

* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
Don't pass URL path and username/password to PAC scripts

Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 13:30:59 +0000 (13:30 +0000)]

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
am: af0b4466ff

* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
Don't pass URL path and username/password to PAC scripts

Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e

commit | commitdiff | tree

Paul Jensen [Thu, 26 May 2016 13:18:04 +0000 (13:18 +0000)]

Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev

commit | commitdiff | tree

Christopher Tate [Thu, 26 May 2016 00:12:37 +0000 (00:12 +0000)]

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade
am: 24ceca96af  -s ours

* commit '24ceca96af925ac19a1fa337afc0e739d9cb11ad':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663

commit | commitdiff | tree

Christopher Tate [Wed, 25 May 2016 23:16:15 +0000 (23:16 +0000)]

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142

commit | commitdiff | tree

Christopher Tate [Wed, 25 May 2016 23:06:02 +0000 (23:06 +0000)]

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours
am: 077534b101

* commit '077534b1015762d445f505fc2f440beaa2ba974a':
DO NOT MERGE : backport of backup transport whitelist

Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf

commit | commitdiff | tree

Christopher Tate [Wed, 25 May 2016 22:45:22 +0000 (22:45 +0000)]

DO NOT MERGE : backport of backup transport whitelist
am: 647cb6a6d8 -s ours

* commit '647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
DO NOT MERGE : backport of backup transport whitelist

Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241

commit | commitdiff | tree

Chris Tate [Wed, 25 May 2016 22:30:56 +0000 (22:30 +0000)]

Merge "Backport of backup transport whitelist" into mnc-dev

commit | commitdiff | tree

Christopher Tate [Fri, 20 May 2016 22:29:31 +0000 (15:29 -0700)]

Backport of backup transport whitelist

Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df791728f4d42d67e935c327910975993ad29 from N

Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87

commit | commitdiff | tree

Jim Miller [Tue, 24 May 2016 22:04:36 +0000 (22:04 +0000)]

Merge "Fix missing permission check when saving pattern/password" into mnc-dev

commit | commitdiff | tree

Christopher Tate [Fri, 20 May 2016 22:29:31 +0000 (15:29 -0700)]

DO NOT MERGE : backport of backup transport whitelist

Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df791728f4d42d67e935c327910975993ad29 from N

Change-Id: I405b49daee8c576584575c3e46877cc97632d8c6

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:43:14 +0000 (22:43 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours am: bfa719f448  -s ours am: 1fae3b370d am: 1da8c9baa2
am: 8238207ce6  -s ours

* commit '8238207ce6268422bcdb50d44f03e6a220081294':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:37:04 +0000 (22:37 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:32:47 +0000 (22:32 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:28:23 +0000 (22:28 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:21:46 +0000 (22:21 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
am: 5527fd1323 -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315

commit | commitdiff | tree

John Reck [Thu, 19 May 2016 19:26:24 +0000 (19:26 +0000)]

DO NOT MERGE Cherry pick libpng usage fixes
am: 7c9f2b8aa2

* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a

commit | commitdiff | tree

John Reck [Mon, 26 Aug 2013 23:53:40 +0000 (16:53 -0700)]

DO NOT MERGE Cherry pick libpng usage fixes

------------------------------------------

This is a combination of 2 commits.
The first commit's message is:

Forward compatibility fixes

Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8

-------------------------------------------

This is the 2nd commit message:

libpng usage tweaks

Bug: 10447005

Call png_set_interlace_handling explicitly instead of relying on
implicit handling that logs warnings

Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99

-------------------------------------------
BUG:23265085

commit | commitdiff | tree

Adam Powell [Thu, 28 Apr 2016 23:32:18 +0000 (16:32 -0700)]

Backport ChooserTarget package source check from N

Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.

Bug 28384423

Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008

commit | commitdiff | tree

Paul Jensen [Fri, 15 Apr 2016 14:41:13 +0000 (10:41 -0400)]

Don't pass URL path and username/password to PAC scripts

The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.

Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed

commit | commitdiff | tree

Jim Miller [Wed, 13 Apr 2016 23:35:36 +0000 (16:35 -0700)]

Fix missing permission check when saving pattern/password

Fixes bug 28163930

Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]

resolve merge conflicts of 44e07e0 to mnc-dev

Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]

resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev

Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 00:05:54 +0000 (00:05 +0000)]

resolve merge conflicts of 7641889 to lmp-mr1-dev
am: cebcde3b5a

* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a

commit | commitdiff | tree

Christopher Tate [Tue, 19 Apr 2016 22:51:37 +0000 (15:51 -0700)]

resolve merge conflicts of 7641889 to lmp-mr1-dev

Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020

commit | commitdiff | tree

Christopher Tate [Mon, 18 Apr 2016 22:16:31 +0000 (15:16 -0700)]

Kill the real/isolated uid group, not the ApplicationInfo uid

This is a direct reimplementation in L of fixes applied to N in
these two commits:

8dc8d37c1d7d694016f1ec2b3cea5fb723567be8
e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa

commit | commitdiff | tree

Michael Wright [Mon, 18 Apr 2016 18:40:17 +0000 (18:40 +0000)]

Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev

commit | commitdiff | tree

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

DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384  -s ours am: c2cc804  -s ours am: 620a4ed am: be58fe0
am: e265f35  -s ours

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

Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d

commit | commitdiff | tree

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

DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed
am: be58fe0

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

Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9

commit | commitdiff | tree

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

DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours
am: 620a4ed

* commit '620a4ed031d807c6945d531d1a98374eba369449':
DO NOT MERGE Fix intent filter priorities

Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f

commit | commitdiff | tree

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

DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384  -s ours
am: c2cc804  -s ours

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

Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6

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:19 +0000 (22:12 +0000)]

DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9
am: ca13384 -s ours

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

Change-Id: I88811d2bce66e53998360909612003873e9407af

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:06:38 +0000 (22:06 +0000)]

DO NOT MERGE Fix intent filter priorities am: 60351d3
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778

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:27 +0000 (22:00 +0000)]

DO NOT MERGE Fix intent filter priorities
am: 60351d3

* commit '60351d3be29977dfe0b422de797a0429edf500b7':
DO NOT MERGE Fix intent filter priorities

Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7

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.

NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched

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

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

Michael Wright [Thu, 31 Mar 2016 00:31:48 +0000 (17:31 -0700)]

Add new, hidden MotionEvent flag for partially obscured windows.

Bug: 26677796
Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6

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: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: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 [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

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

Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf  -s ours am: 0d3e46391a am: 9c841923df  -s ours am: a76208d4e4 am: 9e52b29fe2
am: 1f6dbd910b  -s ours

* commit '1f6dbd910bf9bf93df8a708209e92add61fbff44':
  DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf  -s ours am: 0d3e46391a
am: 9c841923df  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours
am: 0d3e46391a

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0
am: 5fc753acaf -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]

DO NOT MERGE Redact Account info from getCurrentSyncs

BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)

commit | commitdiff | tree

Matthew Williams [Wed, 20 Jan 2016 11:51:42 +0000 (11:51 +0000)]

Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Wed, 20 Jan 2016 11:46:39 +0000 (11:46 +0000)]

Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Wed, 20 Jan 2016 11:41:23 +0000 (11:41 +0000)]

Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Wed, 20 Jan 2016 11:37:17 +0000 (11:37 +0000)]

Redact Account info from getCurrentSyncs am: f39549e389
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Wed, 20 Jan 2016 11:32:56 +0000 (11:32 +0000)]

Redact Account info from getCurrentSyncs
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
Redact Account info from getCurrentSyncs

commit | commitdiff | tree

Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]

Redact Account info from getCurrentSyncs

BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am: 66841a62f1 -s ours

* commit '66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]

Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours am: 009fb756ec  -s ours
am: b409a99ccc  -s ours

* commit 'b409a99ccc0a42814f3918c689d06526c09f726b':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours am: 4df8f4abe0  -s ours
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]

Revert "Import translations. DO NOT MERGE" am: 8874f9754f  -s ours
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]

Revert "Import translations. DO NOT MERGE"
am: 8874f9754f -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]

Revert "Import translations. DO NOT MERGE"

This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours am: 83bf32ebe5  -s ours
am: 42692affe2  -s ours

* commit '42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 14:05:05 +0000 (14:05 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours am: b441c6926b  -s ours
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:59:58 +0000 (13:59 +0000)]

Import translations. DO NOT MERGE am: 9f9e736e0d  -s ours
am: b441c6926b  -s ours

* commit 'b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:54:49 +0000 (13:54 +0000)]

Import translations. DO NOT MERGE
am: 9f9e736e0d -s ours

* commit '9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:46:48 +0000 (08:46 -0500)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:43:25 +0000 (13:43 +0000)]

Import translations. DO NOT MERGE
am: a4505e9264 -s ours

* commit 'a4505e926410cbf20dcd301f35f3496628cad9de':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 13:34:53 +0000 (08:34 -0500)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]

Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1
am: 78f672ef05

* commit '78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]

Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b
am: aa2210c5c1

* commit 'aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]

Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468
am: 4340e0677b

* commit '4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]

Fix plurals variable to unblock Translations Pipeline.
am: 61f9f31468

* commit '61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.

commit | commitdiff | tree

Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]

Fix plurals variable to unblock Translations Pipeline.

Bug: 19067882
(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49

commit | commitdiff | tree

Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.

commit | commitdiff | tree

Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.