Commit Graph

21588 Commits

Author SHA1 Message Date
Christopher Tate
cebcde3b5a resolve merge conflicts of 7641889 to lmp-mr1-dev
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
2016-04-19 15:51:37 -07:00
Christopher Tate
76418899e6 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:

8dc8d37c1d
e8741d23d2

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
2016-04-18 15:20:01 -07:00
Todd Kennedy
d6174e7402 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
2016-04-05 10:20:41 -07:00
Samuel Tan
d385a6d95f [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
2016-03-18 14:25:41 -07:00
Shreyas Basarge
5e4e02b009 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1
am: 6fc321a66d

* commit '6fc321a66d74401e00b2203817f75e29a0426ab7':
  NPE fix for SyncStorageEngine read authority
2016-02-20 01:37:34 +00:00
Shreyas Basarge
6fc321a66d NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17
am: eec587edf1

* commit 'eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
  NPE fix for SyncStorageEngine read authority
2016-02-20 01:27:25 +00:00
Shreyas Basarge
eec587edf1 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05
am: 58048c1f17

* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
  NPE fix for SyncStorageEngine read authority
2016-02-20 01:01:10 +00:00
Shreyas Basarge
58048c1f17 NPE fix for SyncStorageEngine read authority am: a962d9eba7
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
  NPE fix for SyncStorageEngine read authority
2016-02-20 00:47:41 +00:00
Shreyas Basarge
a962d9eba7 NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.

Bug: 26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
2016-02-19 23:38:33 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:14:32 +00:00
Matthew Williams
a5cafd2a93 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 b63057e698)
2016-01-21 14:15:11 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 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 b63057e698)
2016-01-20 00:02:58 +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
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
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
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
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:13:40 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:06:27 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit 3b49affdb3.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
2015-09-16 01:38:41 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This reverts commit 82b70db7dd.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
2015-09-15 20:09:52 +00:00
Tao Bao
82b70db7dd [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-08-31 14:34:14 -07:00
Paul Jensen
a12044215b Fix NOT_RESTRICTED network capability and enforce it.
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d)
2015-08-28 12:48:11 -04:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
2015-07-01 16:39:11 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
2015-07-01 16:18:42 +00:00
Wale Ogunwale
78a22fd273 Prevent system uid component from running in an app process
Bug: 21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
2015-06-25 09:29:58 -07:00
Wale Ogunwale
dd673a63a6 Prevent system uid component from running in an app process
Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit 44368567f8)
2015-06-24 22:02:05 +00:00
Wale Ogunwale
5a487696e2 Prevent system uid component from running in an app process
Bug: 21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit 44368567f8)
2015-06-24 22:01:15 +00:00
Justin Harrison
127d0b8065 Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 2015-06-03 19:20:45 +00:00
Justin Harrison
aa9a679b00 Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
This reverts commit c48c31394e.

Change-Id: Ia2b59da5d953a8a692c0e2f5eabb12e952dbdea1
2015-06-03 19:18:30 +00:00
Justin Harrison
29b9888467 Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 2015-06-03 19:18:06 +00:00
Justin Harrison
c48c31394e Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
This reverts commit afd883f8a3.

Change-Id: Ia4fadbbc7e531d13cd9e9019f0cdb30cc090cb7a
2015-06-03 18:48:19 +00:00
Svetoslav
18fb1c92d8 am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit 'bf0652eeea280bb1d687fe2fc3e869e0f6e9a541':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-06-01 23:02:37 +00:00
Svetoslav
bf0652eeea DO NOT MERGE Don't take flags when creating app widget config activity.
bug:19618745

Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
2015-06-01 12:55:38 -07:00
Wale Ogunwale
02f3cf7998 am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 05:03:29 +00:00
Wale Ogunwale
523a19bf3d am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 04:50:11 +00:00
Wale Ogunwale
c9a0c0b907 Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.

Bug: 20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit 9dbaa54f68)
2015-05-26 17:49:04 +00:00
Christopher Tate
afd883f8a3 During early boot, send LOCALE_CHANGED only to registered receivers
Bug 20855725
Bug 19060618

Change-Id: I368660ecc6ee97a0c2a2f627fa1b09288bc92bd1
2015-05-11 18:00:45 -07:00
Christopher Tate
ea2c403311 Mark persistent apps as such when the ProcessRecord is created
...rather than only during the OS's "time to start the persistent apps"
boot phase.  This closes a window of opportunity during which a
persistent app container may be live without having been properly
noted as such, because it wound up being launched prior to the
[rather late] boot phase at which the persistent apps are directly
enumerated and bookkeeping for them established.

Bug 20855725

Change-Id: I41822b412de4540dbdeab300b38089303678f76c
2015-05-08 13:05:42 -07:00
Svet Ganov
68e6b5055b DO NOT MERGE Don't take flags when creating app widget config activity.
bug:19618745

Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Matthew Williams
28358eaed2 Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 2015-04-06 20:22:22 +00:00
Wale Ogunwale
70e12aa123 [DO NOT MERGE] Fixed NPE when trying to animate a window without display
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
2015-04-02 16:38:52 -07:00
Bart Sears
4a26c391d0 Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 2015-03-27 20:48:38 +00:00
Christopher Tate
dbe0dd160e When scanning unbundled apps, only install the expected APK tree
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
2015-03-26 15:55:30 -07:00
Junichi Monma
ce8a9f53b2 Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
bug id : b/19938983

Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
2015-03-26 22:54:21 +09:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
2015-03-26 03:57:33 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb07)
2015-03-26 03:01:02 +00:00
Jinsuk Kim
bd3deee37b CEC: Explicitly turn on screen for remote control passthrough
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52a)
2015-03-26 02:01:11 +00:00