OSDN Git Service
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
am
663b4e97: am
37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '
663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
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.
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)
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am
5d3c8c89: 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 '
5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
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
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
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
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
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
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
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
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
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
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
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
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
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
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
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
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
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
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove 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)
Amith Yamasani [Fri, 27 Sep 2013 18:55:35 +0000 (11:55 -0700)]
am
da0e4483: 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 '
da0e448379ff4bcc778fbbe1f203ec322378244f':
Make sure that external callers cannot pass in the confirm bypass extra
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
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
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
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
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
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
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
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
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
Wink Saville [Fri, 30 Aug 2013 03:42:59 +0000 (20:42 -0700)]
am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
e38165caf08a164999b9518dd1f16c9f94d581e9':
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.
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
Wink Saville [Thu, 29 Aug 2013 18:57:48 +0000 (11:57 -0700)]
am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
0e042a44a8ee0e26d92be8d73d7ed297b4beab37':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
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.
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
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da7395d6c5a92738c2e7130590f30a536ec94b54':
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
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import 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
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
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
Baligh Uddin [Wed, 28 Aug 2013 02:40:21 +0000 (19:40 -0700)]
am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:37:03 +0000 (19:37 -0700)]
am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
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
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
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
Baligh Uddin [Thu, 22 Aug 2013 17:59:01 +0000 (10:59 -0700)]
am
56c597c1: (-s ours) am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
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
Baligh Uddin [Thu, 22 Aug 2013 17:55:44 +0000 (10:55 -0700)]
am
f23da91e: (-s ours) Import translations. DO NOT MERGE
* commit '
f23da91e52169b920fb21a10ff76d617117d5f95':
Import 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
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
Baligh Uddin [Mon, 19 Aug 2013 20:04:58 +0000 (13:04 -0700)]
am
2b851859: (-s ours) am
b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '
2b85185988eec44b6fdd3ee072d44b0a7a72d432':
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
Baligh Uddin [Mon, 19 Aug 2013 20:00:37 +0000 (13:00 -0700)]
am
8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '
8485f115d25968c0fa3ab9d1ea42d2751422feb5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:36 +0000 (13:00 -0700)]
am
e37538b1: (-s ours) am
8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '
e37538b122199f316b8b8eb76a6445de6f5c83be':
Import 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
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
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
Baligh Uddin [Fri, 16 Aug 2013 00:48:05 +0000 (17:48 -0700)]
am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
Import 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
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
Baligh Uddin [Tue, 13 Aug 2013 07:45:32 +0000 (00:45 -0700)]
am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
728da4558087e5b3fe25fad7eedb4f5de5c4068f':
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
Baligh Uddin [Tue, 13 Aug 2013 07:42:11 +0000 (00:42 -0700)]
am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
054041058f9706c95b3d72ca421fcb656ad59d1e':
Import 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
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
Baligh Uddin [Wed, 7 Aug 2013 17:28:43 +0000 (10:28 -0700)]
am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
d01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 17:24:07 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
The Android Open Source Project [Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
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
Conflicts:
res/values-nl/strings.xml
res/values-sw/strings.xml
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
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
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
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
Baligh Uddin [Wed, 7 Aug 2013 03:05:46 +0000 (20:05 -0700)]
am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
9a53339dd6ea5c683629a5fff8837e7e59581680':
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
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
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
Dianne Hackborn [Mon, 5 Aug 2013 23:49:02 +0000 (16:49 -0700)]
am
a5ac281d: am
40557800: Fix issue #
10190597: "Any permission restrictions" is displayed after a...
* commit '
a5ac281db7103aef790a6141cd72fdbc22835552':
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
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...
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
Dianne Hackborn [Mon, 5 Aug 2013 18:15:43 +0000 (11:15 -0700)]
am
8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '
8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
Fix app ops details not displaying permissions under certain conditions.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Dianne Hackborn [Mon, 5 Aug 2013 18:11:11 +0000 (18:11 +0000)]
Merge "Fix app ops details not displaying permissions under certain conditions."
Danny Baumann [Mon, 5 Aug 2013 12:28:58 +0000 (14:28 +0200)]
Fix app ops details not displaying permissions under certain conditions.
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.
Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
Dianne Hackborn [Sat, 3 Aug 2013 02:32:14 +0000 (19:32 -0700)]
am
0a09b13c: am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
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.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:44:48 +0000 (17:44 -0700)]
am
4dce3456: am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
Completely remove app ops activity.
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.
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dianne Hackborn [Fri, 2 Aug 2013 21:41:18 +0000 (14:41 -0700)]
am
ca1b7458: Completely remove app ops activity.
* commit '
ca1b7458244191214172009d21eae2d04b6992f9':
Completely 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
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
Dave Burke [Fri, 2 Aug 2013 20:42:04 +0000 (13:42 -0700)]
am
1a32d477: am
136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '
1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
OSDN Git Service
