Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,328 Commits 3 Branches 0 Tags
42692affe23352b7e0bbcc9ef4d6f5fb661cc943
Commit Graph

178328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
42692affe2 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours 
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE
 2016-01-11 14:05:05 +00:00
Geoff Mendal
83bf32ebe5 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours 
am: b441c6926b  -s ours

* commit 'b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:58 +00:00
Geoff Mendal
b441c6926b Import translations. DO NOT MERGE 
am: 9f9e736e0d  -s ours

* commit '9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:49 +00:00
Geoff Mendal
9f9e736e0d Import translations. DO NOT MERGE 
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
 2016-01-11 08:46:48 -05:00
Geoff Mendal
a4505e9264 Import translations. DO NOT MERGE 
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
 2016-01-11 08:34:53 -05:00
Baligh Uddin
78f672ef05 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b 
am: aa2210c5c1

* commit 'aa2210c5c174fd681fd52fd43e55de6c018a93ad':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:26:49 +00:00
Baligh Uddin
aa2210c5c1 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 
am: 4340e0677b

* commit '4340e0677b691f2ab12549556c23b88e599cf8c1':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:22:23 +00:00
Baligh Uddin
4340e0677b Fix plurals variable to unblock Translations Pipeline. 
am: 61f9f31468

* commit '61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:11 +00:00
Baligh Uddin
61f9f31468 Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe2)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:54:41 +00:00
Robert Greenwalt
81674b1ff5 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.
 2015-12-18 19:04:25 +00:00
Robert Greenwalt
2ecc918bd3 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.
 2015-12-18 18:48:59 +00:00
Robert Greenwalt
5946a9b798 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.
 2015-12-18 18:38:10 +00:00
Robert Greenwalt
5a77651489 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
 2015-12-17 19:32:43 -08:00
Robert Greenwalt
9887f2f50a Protect some new broadcasts. 
DEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected,
allowing 3rd parties to potentially spoof the bcasts feeding misinformation
to system listeners.

bug:25778215
Change-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5
 2015-12-04 15:54:53 -08:00
Sreeram Ramachandran
33c1718205 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 
am: d3b6e2d790

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd 
am: 42faa221d7

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:10:19 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 2015-11-19 15:59:42 +00:00
Sreeram Ramachandran
f1f45fe012 Don't use framework permission strings for netd permissions. 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839)
 2015-11-18 17:04:18 +00:00
Michael Wright
bd23716585 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de 
am: 614ea46405

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:06:27 +00:00
Michael Wright
614ea46405 DO NOT MERGE. Prevent recents from coming up when in SUW 
am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:52:13 +00:00
Michael Wright
84669ca8de DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
 2015-11-13 21:52:18 +00:00
Winson Chung
32265b9ea0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 
am: b133b984a0

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:30 +00:00
Winson Chung
b133b984a0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 
am: bb4da4efc3

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:38 +00:00
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Shreyas Basarge
64bdb9f06b Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e 
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:40 +00:00
Shreyas Basarge
359ee7f47d Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:24 +00:00
Shreyas Basarge
bf29f10c1e Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af 
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:36 +00:00
Shreyas Basarge
44368e6dd4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f 
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:34 +00:00
Matthew Williams
6d13650c74 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece 
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705 
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:02 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE 
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Shreyas Basarge
2f137b7705 Sync extras bundle comparison can throw NPE 
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
 2015-11-12 15:32:44 +00:00
Winson
16a76dadcc DO NOT MERGE Ensure that the device is provisioned before showing Recents. 
Bug: 25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
 2015-11-11 17:47:55 +00:00
Matthew Williams
c0f39c1ece Sync extras bundle comparison can throw NPE 
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
 2015-11-11 14:34:04 +00:00
Dan Sandler
7e16b2e8f5 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b 
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:49 +00:00
Dan Sandler
511357c39b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours 
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:49:54 +00:00
Dan Sandler
6026b5b17e Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:50 +00:00
Dan Sandler
b1de85487a Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-23 23:39:22 +00:00
Dan Sandler
1044e162c3 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf771)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
 2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77 Delay hiding the cast icon for 3 seconds. DO NOT MERGE 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf771)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
 2015-10-23 01:38:36 +00:00
Adrian Roos
fe7ceca1ac am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:25:48 +00:00
Adrian Roos
9ceec2f0f0 am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:11:55 +00:00
Adrian Roos
f6c7515817 am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:59:37 +00:00