OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoSECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.

Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends.  This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.

Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)

10 years agoam 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am...
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '90630f6a6d19e169befb8ad8117d53200eb562c4':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am...
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add...
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after...
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '4692a48c28d7002221fec28d5ac324636f81c8f2':
  Add lockout after trying to enter PIN / Password too often

10 years agoam c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter...
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit 'c4bfea207acf62c9e70949d3225d082d95d4d193':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Passwo...
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 8184ea52: Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '8184ea524519a67b1284266844e6e186f3a74cab':
  Add lockout after trying to enter PIN / Password too often

10 years agoAdd lockout after trying to enter PIN / Password too often
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often

Enforce the same lockout that is already enforced when entering the pattern.

Bug: 13647935

Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7

10 years agoam 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am...
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
  Remove unused DebugIntentSender

10 years agoam 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am...
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
  Remove unused DebugIntentSender

10 years agoam 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove...
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
  Remove unused DebugIntentSender

10 years agoam 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugI...
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
  Remove unused DebugIntentSender

10 years agoam 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
  Remove unused DebugIntentSender

10 years agoam 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
  Remove unused DebugIntentSender

10 years agoam 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
  Remove unused DebugIntentSender

10 years agoam c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am c7843db0: Remove unused DebugIntentSender

* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
  Remove unused DebugIntentSender

10 years agoRemove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender

Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4082c89e31a9489e4309566bda2fec8)

10 years agoam aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am...
Amith Yamasani [Fri, 27 Sep 2013 18:51:16 +0000 (11:51 -0700)]
am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit 'aad8d90ce082d01e6420227572891a2fce65306a':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am...
Amith Yamasani [Fri, 27 Sep 2013 18:46:25 +0000 (11:46 -0700)]
am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit 'b4881f79e1c065b40f234710b6fb28acce9e164f':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make...
Amith Yamasani [Fri, 27 Sep 2013 18:27:47 +0000 (11:27 -0700)]
am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '451d8225ef3ae407f52512a93bcf04e6400eb997':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that exter...
Amith Yamasani [Fri, 27 Sep 2013 18:24:28 +0000 (11:24 -0700)]
am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '49187c9418dc2c5f404385596db3d82dd896c178':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers...
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '53a56ad89cbd14410dcd8e5755c6765f1a438928':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass...
Amith Yamasani [Fri, 27 Sep 2013 18:18:04 +0000 (11:18 -0700)]
am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '447415f4f17dc91d3844394625f4e6fa10efedad':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm...
Amith Yamasani [Fri, 27 Sep 2013 18:14:30 +0000 (11:14 -0700)]
am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '7870850387dabd32a54e3fca7d65dea5f45a9a16':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoam 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Fri, 27 Sep 2013 18:10:37 +0000 (11:10 -0700)]
am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra

* commit '77aa51e5b7261638590af1d69ac03f4c8cd25692':
  Make sure that external callers cannot pass in the confirm bypass extra

10 years agoMake sure that external callers cannot pass in the confirm bypass extra
Amith Yamasani [Wed, 25 Sep 2013 21:05:33 +0000 (14:05 -0700)]
Make sure that external callers cannot pass in the confirm bypass extra

Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.

Also, make sure that the fragments are launched with the correct corresponding
activity.

Bug: 9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564

10 years agoam 7bee4c29: Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 03:41:04 +0000 (20:41 -0700)]
am 7bee4c29: Use correct action string for provisioning.

* commit '7bee4c294204be49edf58e9251726425ffcc5748':
  Use correct action string for provisioning.

10 years agoUse correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.

Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK

Bug: 10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098

10 years agoam 289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into...
Wink Saville [Thu, 29 Aug 2013 17:23:04 +0000 (10:23 -0700)]
am 289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev

* commit '289c2f0d3013f423849a9485b3044f0a1fc8dd92':
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.

10 years agoMerge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev

10 years agoam c7902845: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am c7902845: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE

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

10 years agoUse MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5

10 years agoam d8c9c146: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:48 +0000 (19:36 -0700)]
am d8c9c146: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 20:55:54 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 20:54:28 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam bf65bf49: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:45 +0000 (10:55 -0700)]
am bf65bf49: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Aug 2013 23:03:04 +0000 (16:03 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam b09878b8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:01:53 +0000 (13:01 -0700)]
am b09878b8: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:04:34 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:03:06 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:11 +0000 (17:48 -0700)]
am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:44:15 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:42:52 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 03ae9bf0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:15 +0000 (00:42 -0700)]
am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 Aug 2013 18:48:59 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 Aug 2013 18:47:40 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Wed, 7 Aug 2013 17:24:07 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

10 years agoam e211fd11: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 03:04:13 +0000 (20:04 -0700)]
am e211fd11: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Aug 2013 04:43:40 +0000 (21:43 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after...
Dianne Hackborn [Mon, 5 Aug 2013 23:45:48 +0000 (16:45 -0700)]
am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...

* commit '405578009471ab7908af26a813f7d2ef8c072a5c':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...

10 years agoFix issue #10190597: "Any permission restrictions" is displayed after a...
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #10190597: "Any permission restrictions" is displayed after a...

...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57

10 years agoam a6683e0f: Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:09 +0000 (19:30 -0700)]
am a6683e0f: Reset app preferences now resets all app ops.

* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
  Reset app preferences now resets all app ops.

10 years agoReset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11

10 years agoam 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:39:03 +0000 (17:39 -0700)]
am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge

* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
  Completely remove app ops activity.

10 years agoReconcile with AOSP jb-mr2-dev - do not merge
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge

10 years agoCompletely remove app ops activity.
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.

Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a

10 years agoam 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:39:13 +0000 (13:39 -0700)]
am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

* commit '136059f118b580a3dc8f3023d1d19c8c56020a01':
  Revert "Completely remove app ops activity."

10 years agoMerge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:36:33 +0000 (20:36 +0000)]
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

10 years agoRevert "Completely remove app ops activity."
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."

This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.

Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222

10 years agoam d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
Sascha Prueter [Thu, 1 Aug 2013 20:58:23 +0000 (13:58 -0700)]
am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev

* commit 'd346fce2687237d30677b69e66c76ba6cba8622b':
  Completely remove app ops activity.

10 years agoMerge "Completely remove app ops activity." into jb-mr2-dev
Sascha Prueter [Thu, 1 Aug 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Completely remove app ops activity." into jb-mr2-dev

11 years agoam 0cb57011: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:15:32 +0000 (09:15 -0700)]
am 0cb57011: (-s ours) Import translations. DO NOT MERGE

* commit '0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Jul 2013 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 542960fb: Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:53:29 +0000 (19:53 -0700)]
am 542960fb: Import translations. DO NOT MERGE

* commit '542960fbbb0c122d7f3a75fd2d5c4710118417ee':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Jul 2013 19:15:51 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 6b939fe2: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:00:14 +0000 (10:00 -0700)]
am 6b939fe2: Import translations. DO NOT MERGE

* commit '6b939fe2c8994acc3e304ec24639d07877a4b255':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Jul 2013 18:10:07 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Jul 2013 18:08:10 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 68b87505: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:16:17 +0000 (15:16 -0700)]
am 68b87505: Import translations. DO NOT MERGE

* commit '68b87505548be6e6734d4cfe90c450b243950455':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Fri, 19 Jul 2013 22:14:12 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

11 years agoam 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Fri, 19 Jul 2013 20:33:33 +0000 (13:33 -0700)]
am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev

* commit '3c087a68f6e627f48eb0cea2dfbf21b47d3ab24a':
  Use ConnectivityManager for mobile provision url

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Jul 2013 21:31:45 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Jul 2013 21:30:01 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Wed, 17 Jul 2013 23:47:01 +0000 (23:47 +0000)]
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev

11 years agoUse ConnectivityManager for mobile provision url
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url

bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1

11 years agoam f9d69170: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:40:53 +0000 (19:40 -0700)]
am f9d69170: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Jul 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Jul 2013 18:36:58 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one...
Wink Saville [Fri, 12 Jul 2013 19:01:43 +0000 (12:01 -0700)]
am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit '80bfbd53151eccb8888aafc81d3dccea87cdca29':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.

11 years agoMerge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Wink Saville [Fri, 12 Jul 2013 18:58:56 +0000 (18:58 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Thu, 11 Jul 2013 21:50:16 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

11 years agoam 2a1ccab1: Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 19:23:19 +0000 (12:23 -0700)]
am 2a1ccab1: Import translations. DO NOT MERGE

* commit '2a1ccab1cdd00af6989eadba1a766120d0b10243':
  Import translations. DO NOT MERGE

11 years agoVZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Thu, 11 Jul 2013 05:19:26 +0000 (22:19 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.

Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 03:30:12 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 03:28:57 +0000 (20:28 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam f1d02056: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:35:21 +0000 (14:35 -0700)]
am f1d02056: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 16:18:57 +0000 (09:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 16:17:21 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 76185f72: Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am 76185f72: Import translations. DO NOT MERGE

* commit '76185f7201b3e8a2d341a62c13f8ac259203a7e7':
  Import translations. DO NOT MERGE

11 years agoam aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 20:56:12 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE

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