196583 Commits

Author SHA1 Message Date
Roshan Pius
1ca6207a1e Change sequence of call removal from Phone's db.
Since the Call API's callbacks are now fired from handlers, they end up
changing the order in which the callbacks from the Phone and Call API's
are fired. To preserve the below ordering, we move the call removal from
Phone's db to after all the onCallDestoryedcallbacks have executed.
1. Call->onStateChanged
2. Call->onDetailsChanged
3. Call->onCallDestroyed
4. Phone->onCallRemoved

BUG: 22127504
Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
2015-07-08 14:47:36 -07:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Jeff Sharkey
7fd3c296f1 Merge "Permission to view shared storage for all users." into mnc-dev 2015-07-06 17:59:11 +00:00
Jeff Sharkey
6d842f63a0 Merge "Fix DocumentsUI animation regression." into mnc-dev 2015-07-06 17:58:10 +00:00
Jeff Sharkey
246d698499 Merge "Handle missing migration source volume." into mnc-dev 2015-07-06 17:57:52 +00:00
Jeff Sharkey
38cae6c8bc Merge "Reconcile private volumes when mounted." into mnc-dev 2015-07-06 17:57:46 +00:00
Jeff Sharkey
32e80d7588 Permission to view shared storage for all users.
Typical apps are restricted so they can only view shared storage
belonging to the user they're running as.  However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.

Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps.  Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.

Bug: 19995822
Change-Id: I504c2a179ba74f142ed0d32da5baa69f4212cd82
2015-07-06 10:54:28 -07:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
Dianne Hackborn
dcd96ead84 Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev 2015-07-06 17:50:28 +00:00
Geoff Mendal
e2222d12c8 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 17:34:06 +00:00
Geoff Mendal
85bac1cc19 Import translations. DO NOT MERGE
Change-Id: I6c69d2d259e0341bb42765b0940a607599df666b
Auto-generated-cl: translation import
2015-07-06 10:29:06 -07:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition.
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
2015-07-06 10:23:13 -07:00
Jason Monk
d369d074f5 Merge "Fix wifi crash" into mnc-dev 2015-07-06 17:19:19 +00:00
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order...
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
2015-07-06 10:17:24 -07:00
Makoto Onuki
dfd6301fa2 Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 2015-07-06 17:13:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Jason Monk
dbd05a98e5 Fix wifi crash
Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d
2015-07-06 13:05:43 -04:00
Dianne Hackborn
167d588b8b Maybe fix issue #22283836 -- package manager NPE.
Change-Id: I0383b9a4f1e0b872b3b427e6ad42fd8aa309b7ab
2015-07-06 09:52:59 -07:00
Amith Yamasani
a72eac60c7 Fix a typo causing NPE in restricted profiles
Bug: 22287398
Change-Id: Iec19d890c7b0b7ffed3381dc3f5a9b3e761362a7
2015-07-06 09:24:08 -07:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
2015-07-06 09:01:36 -07:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Geoff Mendal
a559590043 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:58:51 +00:00
Geoff Mendal
b7b84d012b Import translations. DO NOT MERGE
Change-Id: I16a0ddf1bed80ef9b985cca96eec87e48d342982
Auto-generated-cl: translation import
2015-07-06 08:56:00 -05:00
Geoff Mendal
210b38d767 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:51:50 +00:00
Geoff Mendal
5d935e8271 Import translations. DO NOT MERGE
Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667
Auto-generated-cl: translation import
2015-07-06 08:50:33 -05:00
Geoff Mendal
b0819373e0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:48:36 +00:00
Geoff Mendal
de04da1d9e Import translations. DO NOT MERGE
Change-Id: I1b900ec1f54720fab0915cede28dd79fbcb70d5c
Auto-generated-cl: translation import
2015-07-06 08:47:43 -05:00
Geoff Mendal
88b4a0ac56 Import translations. DO NOT MERGE
Change-Id: Icd52bfb7b30de7dbc2c7c7e7f073a4fddb5fa5e3
Auto-generated-cl: translation import
2015-07-06 08:43:33 -05:00
Lorenzo Colitti
b0b3d0bcfb Fix two parsing bugs in new DHCP client.
1. We don't parse PAD options properly, leading in failure to
   parse packets sent by DHCP servers that put the end of options
   marker after pad options and at an odd offset.
2. We get the DhcpResults vendorInfo from the wrong option type
   (60 instead of 43).

Fix these and add unit tests for the offer packets sent by a few
different DHCP servers.

Bug: 21955617
Bug: 22281295
Change-Id: I5d13f1a6a3ff0b53112f18f3db8792fa32ad2da3
2015-07-06 13:50:53 +09:00
Jeff Sharkey
1f6c9a1214 Fix DocumentsUI animation regression.
Various fragments need backgrounds to protect their contents during
animation transitions.

Bug: 22232368
Change-Id: I4ce4c57650f9b64b3c6101d829dd484417585410
2015-07-05 14:44:51 -07:00
Jeff Sharkey
ef10ee0145 Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I40645f8ccea05154e7cbacd188f6cba5f4dbbdc4
2015-07-05 14:34:13 -07:00
Ian Pedowitz
738a8dfcdc Merge "Fixing log typo. s/realted/related" into mnc-dev 2015-07-05 01:13:44 +00:00
Ian Pedowitz
9139b29ca6 Fixing log typo. s/realted/related
Bug: 22273408
Change-Id: I756f56ee80d5840bd734249826eb658cbf472921
2015-07-05 01:12:34 +00:00
Jeff Sharkey
6dce4964b4 Reconcile private volumes when mounted.
Many things can happen while a private volume is ejected, so we need
to reconcile newly mounted volumes against known state.

First, user IDs can be recycled, so we store the serial number in the
extended attributes of the /data/user/[id] directory inode.  Since a
serial number is always unique, we can quickly determine if a user
directory "10" really belongs to the current user "10".  When we
detect a mismatched serial number, we destroy all data belonging to
that user.  Gracefully handles upgrade case and assumes current serial
number is valid when none is defined.

Second, we destroy apps that we find no record of, either due to
uninstallation while the volume was unmounted, or reinstallation on
another volume.

When mounting a volume, ensure that data directories exist for all
current users.  Similarly, create data directories on all mounted
volumes when creating a user.  When forgetting a volume, gracefully
uninstall any apps that had been installed on that volume.

Bug: 20674082, 20275572
Change-Id: I4e3448837f7c03daf00d71681ebdc96e3d8b9cc9
2015-07-04 17:08:42 -07:00
Svet Ganov
85be0c4e21 Fix app ops aidl as it is also used from native.
bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6
2015-07-03 16:23:19 -07:00
Svet Ganov
255aece7de Improve request permission docs
bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
2015-07-03 16:04:00 -07:00
Svet Ganov
77ab6a888a Show basic feature warning for default granted permissions
bug:22174223

Change-Id: Ie8209e1f678ac459893151b5125e86eb5025aad8
2015-07-03 12:19:02 -07:00
Robin Lee
a7bdb6c99b Merge "KeyChain: annotate with @WorkerThread" into mnc-dev 2015-07-03 16:48:15 +00:00
Lorenzo Colitti
71e3d079d6 Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev 2015-07-03 02:37:46 +00:00
Svet Ganov
2799767886 Merge "Grant the default gallery app storage permissions" into mnc-dev 2015-07-02 21:37:58 +00:00
Svetoslav
212bd4280d Merge "Make granting default SMS and Phone permissions robust" into mnc-dev 2015-07-02 21:37:33 +00:00
Anthony Lee
930d6b07e3 Merge "Add capability to indicate a conference will never have children." into mnc-dev 2015-07-02 18:33:53 +00:00
Rubin Xu
b1f4cc647f Merge "Remove ExternalMediaFormatActivity" into mnc-dev 2015-07-02 16:22:46 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
2015-07-02 16:53:57 +01:00
Alex Chau
be6307606e Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev 2015-07-02 14:37:04 +00:00
Nicolas Prevot
2ee3beedb1 Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev 2015-07-02 12:28:46 +00:00