OSDN Git Service
Sanket Padawe [Thu, 9 Jul 2015 01:31:23 +0000 (01:31 +0000)]
am
58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit '
58295e71d293c131508d280f1373d94716348b2e':
Add Null checks while processing pairing cancel intent
Adam Lesinski [Thu, 9 Jul 2015 01:31:20 +0000 (01:31 +0000)]
am
7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '
7fb1655a891de275ab8a752294c42b9c13352af6':
BatteryStats: Fail gracefully on corrupt battery stats
Sanket Padawe [Thu, 9 Jul 2015 01:16:01 +0000 (01:16 +0000)]
Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
Adam Lesinski [Thu, 9 Jul 2015 01:15:14 +0000 (01:15 +0000)]
Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
Sanket Padawe [Tue, 7 Jul 2015 21:12:15 +0000 (14:12 -0700)]
Add Null checks while processing pairing cancel intent
Use case: Exception while handling pairing cancel
Intent received
1. Initiate pairing from DUT to remote
2. Power off DUT after getting pairing popup
Root Cause:Crash observed in settings application
Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728
Fix: Fixed by adding Null check in PairingCancelHandler
Robert Greenwalt [Thu, 9 Jul 2015 00:47:51 +0000 (00:47 +0000)]
am
de335a7d: Merge "Fix Permission Typo." into mnc-dev
* commit '
de335a7dc4dcd6b1de8f4c455184f4c82d42612d':
Fix Permission Typo.
Mady Mellor [Thu, 9 Jul 2015 00:37:54 +0000 (00:37 +0000)]
am
84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '
84005b40499c0e9cc914afd69570c1f78c92b8d1':
Use hint text to position handle / floating tool bar popups
Svetoslav [Thu, 9 Jul 2015 00:37:49 +0000 (00:37 +0000)]
am
6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '
6638c182635c6af036980ebdacc9c88411dcf583':
Fix reset permissions on clear data and package uninstall.
Svet Ganov [Thu, 9 Jul 2015 00:37:45 +0000 (00:37 +0000)]
am
9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '
9b84b5c5131634ad81b161cb1806d4f5197e1712':
Update storage group icon
Jack Yu [Thu, 9 Jul 2015 00:37:41 +0000 (00:37 +0000)]
am
6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '
6b7a07848b21001a41aea1b6426ec2f75ea652ec':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
Amith Yamasani [Thu, 9 Jul 2015 00:37:37 +0000 (00:37 +0000)]
am
705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
* commit '
705ba9606325df6575d171ee96811d215e69b4e8':
Qualify the uid with the userId when granting permissions
Robert Greenwalt [Thu, 9 Jul 2015 00:36:31 +0000 (00:36 +0000)]
Merge "Fix Permission Typo." into mnc-dev
Adam Lesinski [Thu, 9 Jul 2015 00:09:34 +0000 (17:09 -0700)]
BatteryStats: Fail gracefully on corrupt battery stats
Bug:
22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
Mady Mellor [Thu, 9 Jul 2015 00:06:11 +0000 (00:06 +0000)]
Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
Svetoslav [Wed, 8 Jul 2015 23:58:00 +0000 (23:58 +0000)]
Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
Robert Greenwalt [Wed, 8 Jul 2015 23:34:33 +0000 (16:34 -0700)]
Fix Permission Typo.
There is no 'd' in privilege. And there is no spell checking in Manifests.
bug:
22358954
Change-Id: Ia122f51a81dc35760f277e23fe0f5a6d3d739457
Svetoslav [Wed, 8 Jul 2015 01:18:15 +0000 (18:18 -0700)]
Fix reset permissions on clear data and package uninstall.
If the user clears data for an app we reset the permission but
only the changes made by the user. We do not modify syste or
policy flags and also ensure the permission that were granted
by default are granted after the data wipe. This is the same
as starting with a clean slate.
If the package whose data is cleared is a part of a shared user
we resent to initial state only the permissions that the cleared
package contributed. Hence, if another package also declared the
permission as used we do not clear the permission state as it is
still in use.
When a package is deleted for a user but still present for another
user we reset its permissions to their inital state follwoing
above described strategy.
Lastly when a preinstalled package wtih an upgrade is diabled
(triggers upgrade uninstall) and this package is a part of a
shared user, we do not drop permission state (grants and flags)
for permissions used by the shadowed system package. This ensures
that we do not drop runtime permission state (such state is
default grants and user changes).i
bug:
22248525
Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
Svet Ganov [Wed, 8 Jul 2015 23:51:19 +0000 (23:51 +0000)]
Merge "Update storage group icon" into mnc-dev
Jack Yu [Wed, 8 Jul 2015 23:45:50 +0000 (23:45 +0000)]
Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
Wale Ogunwale [Wed, 8 Jul 2015 23:45:36 +0000 (23:45 +0000)]
am
dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
dad62b9f993b95bb9a0c20d29c69d35bd7531008':
Finish already paused activity if it should be finished after pausing
Amith Yamasani [Wed, 8 Jul 2015 23:44:53 +0000 (23:44 +0000)]
Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
Wale Ogunwale [Wed, 8 Jul 2015 23:34:29 +0000 (23:34 +0000)]
Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 23:23:48 +0000 (23:23 +0000)]
am
9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev
* commit '
9f4c4ee66632e1355afa1218021ed728a99f7415':
Fix crash looping SystemUI.
Selim Cinek [Wed, 8 Jul 2015 23:23:44 +0000 (23:23 +0000)]
am
9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev
* commit '
9201385f2e59d58bc52a5fbe5a3b666850dcae5f':
Cleaned up the clipping logic for the dismiss motion.
Jeff Sharkey [Wed, 8 Jul 2015 23:14:09 +0000 (23:14 +0000)]
Merge "Fix crash looping SystemUI." into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 23:11:55 +0000 (16:11 -0700)]
Fix crash looping SystemUI.
Bug:
22358954
Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
Ian Pedowitz [Wed, 8 Jul 2015 23:10:53 +0000 (23:10 +0000)]
am
224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '
224f0369ca2ab6265379ce170c8779a7385a33f3':
com.android.mms is no more, so removing from default_sms_application
Sasha Levitskiy [Wed, 8 Jul 2015 23:10:49 +0000 (23:10 +0000)]
am
12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '
12328ef422027f2f5f033ed65c8a09535f9ca81d':
Fingerprint: Add post enroll interface.
Jim Miller [Wed, 8 Jul 2015 23:10:42 +0000 (23:10 +0000)]
am
e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev
* commit '
e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
Don't use fingerId when creating names
Vineeta Srivastava [Wed, 8 Jul 2015 23:10:38 +0000 (23:10 +0000)]
am
99b8820f: Use fingerid 0 when checking failed attempts.
* commit '
99b8820fd7357f6287e65468b23751279562807b':
Use fingerid 0 when checking failed attempts.
Selim Cinek [Wed, 8 Jul 2015 23:08:47 +0000 (23:08 +0000)]
Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev
Ian Pedowitz [Wed, 8 Jul 2015 23:01:17 +0000 (23:01 +0000)]
Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
Ian Pedowitz [Wed, 8 Jul 2015 02:37:22 +0000 (19:37 -0700)]
com.android.mms is no more, so removing from default_sms_application
Fixing a minor comment typo
Bug:
22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
Sasha Levitskiy [Wed, 8 Jul 2015 22:59:49 +0000 (22:59 +0000)]
Merge "Fingerprint: Add post enroll interface." into mnc-dev
Jim Miller [Wed, 8 Jul 2015 22:58:21 +0000 (22:58 +0000)]
Merge "Don't use fingerId when creating names" into mnc-dev
Amith Yamasani [Wed, 8 Jul 2015 22:57:24 +0000 (15:57 -0700)]
Qualify the uid with the userId when granting permissions
Calls to remountUid() for secondary users was not using the
correct uid. This would prevent providing the required
storage permissions to default apps.
Discovered when investigating bug:
22356546
Change-Id: I98c8f6da724e46331c1c90b95969ca0871ef4fe9
Sasha Levitskiy [Wed, 8 Jul 2015 20:22:20 +0000 (13:22 -0700)]
Fingerprint: Add post enroll interface.
Bug:
22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Vineeta Srivastava [Wed, 8 Jul 2015 20:37:09 +0000 (13:37 -0700)]
Use fingerid 0 when checking failed attempts.
It is valid to have finger id as Hex value which is not necessarily less than 0.
Always compare with finger id 0 to make sure we are not locking out user.
Bug:
22354158
Change-Id: I19ded12ae4ee335621fd278163c652fc154be6cf
Jack Yu [Tue, 7 Jul 2015 00:23:52 +0000 (17:23 -0700)]
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
bug:
22229152
Change-Id: Ide02f0c3faafd37b8205f92df8a33a0bc95dd3d7
Roshan Pius [Wed, 8 Jul 2015 22:08:46 +0000 (22:08 +0000)]
am
8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev
* commit '
8f596907a5241badad821a6d3490eb2cd7dd23c5':
Change sequence of call removal from Phone's db.
Jorim Jaggi [Wed, 8 Jul 2015 22:08:38 +0000 (22:08 +0000)]
am
6d712e06: Remove volume motion delay
* commit '
6d712e06f7c35d4120ce8ded5961d3bb97c44cab':
Remove volume motion delay
Roshan Pius [Wed, 8 Jul 2015 22:03:22 +0000 (22:03 +0000)]
Merge "Change sequence of call removal from Phone's db." into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 22:01:32 +0000 (22:01 +0000)]
am
9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '
9d587a97b9cf89f85d1782a6af66bff487568945':
Kill MediaProvider during drastic changes.
Use best volume description for MTP.
Jeff Sharkey [Wed, 8 Jul 2015 22:01:28 +0000 (22:01 +0000)]
am
c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit '
c66b90fecd06691535157e6b00088de61b51dc41':
Generate stable MTP storage IDs.
David Friedman [Wed, 8 Jul 2015 22:01:24 +0000 (22:01 +0000)]
am
2a33526b: am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
2a33526b70fbf471b89451b2c2b4553efc286698':
Docs: Adds fugu system-image links and hashes for M-Preview.
Jorim Jaggi [Mon, 6 Jul 2015 23:18:11 +0000 (16:18 -0700)]
Remove volume motion delay
Disable window animations, so we can start the show animation directly.
Bug:
21335976
Change-Id: I1d25d0ce46b9a068efed0a1561051072cda226a9
Jeff Sharkey [Wed, 8 Jul 2015 21:55:52 +0000 (21:55 +0000)]
Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
Kill MediaProvider during drastic changes.
Use best volume description for MTP.
Jeff Sharkey [Wed, 8 Jul 2015 21:55:10 +0000 (21:55 +0000)]
Merge "Generate stable MTP storage IDs." into mnc-dev
Roshan Pius [Wed, 8 Jul 2015 00:34:51 +0000 (17:34 -0700)]
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
David Friedman [Wed, 8 Jul 2015 21:46:25 +0000 (21:46 +0000)]
am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
9568a412377eb5ef247f843c1845b433eb648645':
Docs: Adds fugu system-image links and hashes for M-Preview.
Robert Greenwalt [Wed, 8 Jul 2015 21:41:06 +0000 (21:41 +0000)]
am
8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
* commit '
8b0f3873a04103f6886fdc2fb79b9a3963567720':
Add/Fix Permission check on SubscriptionManager.
David Friedman [Wed, 8 Jul 2015 21:33:35 +0000 (21:33 +0000)]
am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
3d52c10e217c4a622b5e7c0767a46ab5d14e58ea':
Docs: Adds fugu system-image links and hashes for M-Preview.
Robert Greenwalt [Wed, 8 Jul 2015 21:26:15 +0000 (21:26 +0000)]
Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
Wale Ogunwale [Wed, 8 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Finish already paused activity if it should be finished after pausing
If the app requests its activity to be finished allow it to be finished
immediately if the activity is already paused.
Bug:
22170595
Change-Id: I1ecc0d5f3b85fd80cbe8cdc1d4e32d5c6a50b20c
Adrian Roos [Wed, 8 Jul 2015 21:16:42 +0000 (21:16 +0000)]
am
7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev
* commit '
7f806ec2288df739a0ec03a2363cc912ad49f443':
Dump internal state of ImageWallpaper
Jeff Sharkey [Wed, 8 Jul 2015 21:06:37 +0000 (14:06 -0700)]
Kill MediaProvider during drastic changes.
Sadly MediaProvider makes a ton of assumptions about storage paths
not changing. To ensure that it picks up radical storage changes,
kill it and let it restart to pick up new paths.
Also give ourselves a longer timeout when benchmarking.
Bug:
20275423
Change-Id: I9971c4667dabdc685cb23528443f085f152c461d
Adrian Roos [Wed, 8 Jul 2015 21:01:24 +0000 (21:01 +0000)]
Merge "Dump internal state of ImageWallpaper" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 20:47:16 +0000 (20:47 +0000)]
am
3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
* commit '
3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
Camera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Wed, 8 Jul 2015 20:34:27 +0000 (20:34 +0000)]
Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Tingting Wang [Wed, 8 Jul 2015 20:20:20 +0000 (20:20 +0000)]
am
4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '
4ccf69e1191244ee104edd74843fc7ae391c5270':
Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Svet Ganov [Wed, 8 Jul 2015 20:16:49 +0000 (13:16 -0700)]
Update storage group icon
bug:
22316881
Change-Id: I64ea70d0d195721bbe12a5b673a010254b952e2f
David Friedman [Wed, 8 Jul 2015 19:11:08 +0000 (12:11 -0700)]
Docs: Adds fugu system-image links and hashes for M-Preview.
This is for English and non-English pages, alike.
Change-Id: I6ad68cee7d416279a5db0a39192fdca14f1f3709
Tingting Wang [Wed, 8 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 03:37:09 +0000 (20:37 -0700)]
Cleaned up the clipping logic for the dismiss motion.
Notifications are now not clipped anymore during the animation
and it is ensured that the State is always correctly reset after
the animation.
Bug:
22232352
Change-Id: Ic873a0b119d5f71c29f5fd9b76a7bee1ae74638b
Tingting Wang [Tue, 7 Jul 2015 23:58:13 +0000 (16:58 -0700)]
Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.
BUG
21900262
Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
Alex Klyubin [Wed, 8 Jul 2015 19:41:07 +0000 (19:41 +0000)]
am
d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
* commit '
d25093d2fd151638a108a110484e579cc1dcaf54':
Reject AlgorithmParameters of wrong type.
Alex Klyubin [Wed, 8 Jul 2015 19:32:02 +0000 (19:32 +0000)]
Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
Mady Mellor [Wed, 8 Jul 2015 19:31:45 +0000 (12:31 -0700)]
Use hint text to position handle / floating tool bar popups
In situations where the hint text does not match the direction of
the TextView's primary selection, when you copy text, and long press
in that EditText to paste, the cursor would use the direction of the
hint text to be placed, whereas the handle and floating tool bar
used the TextView's direction to be placed so they wouldn't match.
This CL updates the handle view and floating tool bars to use the
hint text direction when appropriate.
Bug:
21480429
Change-Id: I8090a5b2738c035522c307535ffa165ca024e811
Etan Cohen [Wed, 8 Jul 2015 19:10:19 +0000 (19:10 +0000)]
am
3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit '
3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf':
Lock screen text: consider possible WFC service in APM
Selim Cinek [Wed, 8 Jul 2015 19:10:15 +0000 (19:10 +0000)]
am
a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
* commit '
a8c247e0b4e14123f85cec00500144ff28aaf6ed':
Fixed a bug where collapserunnables where dropped
Etan Cohen [Wed, 8 Jul 2015 19:02:31 +0000 (19:02 +0000)]
Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 18:55:19 +0000 (11:55 -0700)]
Camera: Enforce ZERO_SHUTTER_LAG mode
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.
Bug:
22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
Etan Cohen [Mon, 6 Jul 2015 23:19:04 +0000 (16:19 -0700)]
Lock screen text: consider possible WFC service in APM
Bug:
22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
Jason Monk [Wed, 8 Jul 2015 17:38:57 +0000 (17:38 +0000)]
am
fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '
fede4258fa1bf880c2b88ebea3c886003662fc74':
Remove bang from not connected wifi
Eric Laurent [Wed, 8 Jul 2015 17:38:53 +0000 (17:38 +0000)]
am
c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '
c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
audio: add definitions for devices connected over IP
Jason Monk [Wed, 8 Jul 2015 17:26:33 +0000 (17:26 +0000)]
Merge "Remove bang from not connected wifi" into mnc-dev
Eric Laurent [Wed, 8 Jul 2015 17:24:22 +0000 (17:24 +0000)]
Merge "audio: add definitions for devices connected over IP" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 17:00:13 +0000 (17:00 +0000)]
am
4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4f5630e51d03980e80fde93154f5a0302c8179a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 16:45:07 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 16:38:01 +0000 (11:38 -0500)]
Import translations. DO NOT MERGE
Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 8 Jul 2015 16:18:20 +0000 (09:18 -0700)]
Use best volume description for MTP.
Otherwise we end up showing adopted storage devices as "Unknown."
Bug:
20275423
Change-Id: Ib42474fd5b3284b1e8eca7de8a4cfbb71a34a107
Jason Monk [Wed, 8 Jul 2015 16:09:52 +0000 (12:09 -0400)]
Remove bang from not connected wifi
Bug:
22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
John Reck [Wed, 8 Jul 2015 15:40:42 +0000 (15:40 +0000)]
Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
Chris Wren [Wed, 8 Jul 2015 14:59:51 +0000 (14:59 +0000)]
am
32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '
32c4802a8ac624e0426888612533a4d649f349b9':
provide a cleaner notification dump
Chris Wren [Wed, 8 Jul 2015 14:46:30 +0000 (14:46 +0000)]
Merge "provide a cleaner notification dump" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:18:11 +0000 (14:18 +0000)]
am
db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
db586e69afc71cbc9864849e29e77bf3b6d5ba3c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:18:07 +0000 (14:18 +0000)]
am
18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
18d4eaf54a60caaa2ffeae810a435bfad4abb59d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:05:53 +0000 (14:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:04:00 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Benjamin Franz [Wed, 8 Jul 2015 14:03:46 +0000 (14:03 +0000)]
am
c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '
c088e30fd403b9843a00cc311e460734bd111c26':
Clarify javadoc of setPermissionPolicy
Geoff Mendal [Wed, 8 Jul 2015 14:03:42 +0000 (14:03 +0000)]
am
20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '
20ad92460bf180abb1d2a154e8ec007ca2330e6d':
Import translations. DO NOT MERGE
Benjamin Franz [Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)]
Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 13:54:50 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Jul 2015 13:48:51 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Jul 2015 13:43:44 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
Benjamin Franz [Wed, 8 Jul 2015 13:24:14 +0000 (14:24 +0100)]
Clarify javadoc of setPermissionPolicy
Bug:
22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
Dirk Dougherty [Wed, 8 Jul 2015 11:57:29 +0000 (11:57 +0000)]
am
e3bb8e43: am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
e3bb8e4306f9f55e5039315c2dddface79ba9bca':
Doc change -- update trade practices link.
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:25 +0000 (11:57 +0000)]
am
a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '
a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
Prevent accidental unlocking of USB data transfer.
Dirk Dougherty [Wed, 8 Jul 2015 11:49:01 +0000 (11:49 +0000)]
am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
cc040d583b121e6a028e2dc47691d3f4f98c6e70':
Doc change -- update trade practices link.