OSDN Git Service
Christoph Studer [Thu, 3 Jul 2014 15:54:42 +0000 (15:54 +0000)]
Merge "Inline replace notification views when layout changes"
Jorim Jaggi [Wed, 2 Jul 2014 22:40:09 +0000 (00:40 +0200)]
Reenable touches to notifications in expanded QS
Revert "Closing the QS when tapping on the notifications now."
This reverts commit
3bb0bb8817690728a40edd3f8f665b09907a451b.
Revert "Disabled touch interaction when in Quick settings."
This reverts commit
5cd19bc6a4fac0513bb285fdaf08b1d19c87f4ae.
Also, shuffle order of notifications and quick settings such that
scrolling still works and delegate touches from stack scroller to
the scroll view for expanded QS panel.
In addition, make the panel close transition work when QS is expanded
and scrolled.
Last but not least, decrease scrim amount so the notifications still
look 100% interactive.
Change-Id: I17710e078cff84bcdf303c22986a31135dae2aee
Jorim Jaggi [Tue, 1 Jul 2014 21:34:41 +0000 (23:34 +0200)]
Implement nice motion for collapsing panel while QS open
Also remove the delay for actions which close the panel. Delaying is
no longer necessary as you still see the touch feedback when the
panel is closed.
Change-Id: I0dffae6998fc41b1590cb182667323f40be3a7d5
Christoph Studer [Fri, 27 Jun 2014 17:32:44 +0000 (19:32 +0200)]
Inline replace notification views when layout changes
Instead of going through a full remove / add when a notification
is updated with a different layout, only re-inflate the inner views.
Bug:
15869868
Change-Id: Ie18c431e7b3e2a6209d4a9b6418b3150781a063f
Marcin Kosiba [Tue, 17 Jun 2014 15:21:03 +0000 (16:21 +0100)]
Preload the WebView package into all applications.
This is a temporary workaround to allow the WebView to move into
an APK.
BUG:
11505352
Change-Id: I0c446d44c3f94f70bced7f471ae6fb74f65d5ff9
Christoph Studer [Wed, 2 Jul 2014 22:23:05 +0000 (00:23 +0200)]
Fix 'stuck notification' bug
Apply implied flags before notifying listeners.
Bug:
15589158
Change-Id: Ie1c7374fa562ff62725361fb0dc8b0d1a6725618
Jessica Hummel [Thu, 3 Jul 2014 14:07:18 +0000 (14:07 +0000)]
Merge "Remove unused action from DevicePolicyManager."
Jessica Hummel [Thu, 26 Jun 2014 11:55:38 +0000 (12:55 +0100)]
Remove unused action from DevicePolicyManager.
This is part of a simplification to cut out one communication with mdm apps.
Change-Id: I7d0067928c20387dca8fcc45a7bc48d9d158fa2c
Brian Duff [Thu, 3 Jul 2014 09:49:24 +0000 (09:49 +0000)]
am
51d70ce9: am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
51d70ce9b8dbbcb7f354c87b722efe84b2a62a28':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 09:43:56 +0000 (09:43 +0000)]
am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
c542745e23fe9d2e71c1f607d66f5570f585133d':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 06:45:04 +0000 (06:45 +0000)]
am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
Fix a typo in NumberPicker javadoc.
Sailesh Nepal [Thu, 3 Jul 2014 04:26:12 +0000 (21:26 -0700)]
Remove handoff APIs
This CL removes the old handoff APIs and renames
handoffCall() to phoneAccountClicked().
Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
Jason Sams [Wed, 2 Jul 2014 21:32:05 +0000 (14:32 -0700)]
Resolve conflicts with AOSP.
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Narayan Kamath [Thu, 3 Jul 2014 11:49:46 +0000 (11:49 +0000)]
Merge "Revert "Enforce USB and storage restrictions""
Narayan Kamath [Thu, 3 Jul 2014 11:45:56 +0000 (11:45 +0000)]
Revert "Enforce USB and storage restrictions"
This reverts commit
39e53714ede48fcb464733834d7d9ccb868efe8a.
Change-Id: I81199fea8ca4b48516792bb02c1c3e90e5916c1f
Selim Cinek [Wed, 2 Jul 2014 20:12:47 +0000 (22:12 +0200)]
Made notifications below speedbump grey.
Also fixed a small scrimming bug where headsup where
scrimmed.
Bug:
15408642
Change-Id: I8319ccb001a1d654af055276de3c64ae388a7e47
Selim Cinek [Wed, 2 Jul 2014 17:40:30 +0000 (19:40 +0200)]
Refactored the notification backgrounds
The background now only uses one specific drawable and emulating
the legacy behaviour by tinting. Notification backrounds are now
also a ripple drawable, giving feedback on click.
Bug:
15837646
Change-Id: Ia3b7dafebe2439cc56ed258264ef33b5b07faa69
Emily Bernier [Thu, 3 Jul 2014 11:07:38 +0000 (11:07 +0000)]
Merge "Enforce USB and storage restrictions"
Jeff Sharkey [Thu, 3 Jul 2014 02:08:47 +0000 (02:08 +0000)]
Merge "Slow progress towards APK clusters."
Jeff Sharkey [Thu, 19 Jun 2014 00:46:05 +0000 (17:46 -0700)]
Slow progress towards APK clusters.
Differentiate between "split APKs" and "cluster packages". A cluster
package is a directory containing zero or more APKs (base+splits),
and a monolithic package is a single APK (base).
PackageSetting will use the directory name as its codePath, so track
the baseCodePath separately. Clarify documentation in several
places.
Require that all installers provide file:// URIs through existing
hidden APIs; PackageInstaller hasn't been able to read content://
URIs for a long time.
Bug:
14975160
Change-Id: I1c6fed1b55205c2474b09871161a98a26669d22e
Alan Viverette [Thu, 3 Jul 2014 00:30:35 +0000 (17:30 -0700)]
Update progress bar styling and labelFor attr type
BUG:
16045463
BUG:
15900514
BUG:
15936901
Change-Id: Ib84e78cd3110d36f49ea5d9fc76a4321132af9ab
Jeff Sharkey [Thu, 3 Jul 2014 01:36:07 +0000 (18:36 -0700)]
CleanSpec to fix build.
Change-Id: I3995214498d22fa1bdb82eb44cda2e5ca6ba02a4
Jeff Sharkey [Thu, 3 Jul 2014 01:35:33 +0000 (01:35 +0000)]
Merge "Fixing missing current api.txt related to CL/495976."
Tyler Gunn [Thu, 3 Jul 2014 01:32:54 +0000 (18:32 -0700)]
Fixing missing current api.txt related to CL/495976.
Bug:
16014224
Change-Id: Ib3b0b65caea194f458a4258a341c21d9898f24d9
Jungshik Jang [Thu, 26 Jun 2014 08:30:05 +0000 (17:30 +0900)]
Define force usage and category for System Audio Control.
This is to be sync with change of system/core/include/system/audio_policy.h
Change-Id: Ibd371197775fb70a96df6e3eef82ec8ae10b0508
Jungshik Jang [Thu, 3 Jul 2014 00:34:05 +0000 (09:34 +0900)]
Log unhandled message which has specific destination.
Broadcast message is unnecessary to log as broadcast message.
Bug:
16039302
Change-Id: Ifffc09b49bceaaf220ce929206eaecb78146016f
Jungshik Jang [Thu, 3 Jul 2014 01:26:14 +0000 (01:26 +0000)]
Merge "Add volume callback for Hdmi-Cec system audio mode."
Jungshik Jang [Mon, 30 Jun 2014 13:26:29 +0000 (22:26 +0900)]
Add volume callback for Hdmi-Cec system audio mode.
Hdmi-Cec's system audio mode delegates audio control to
audio receiver from tv. It requires to delegate
volume change including mute to audio receiver
instead of consuming by tv.
In order to do this this change introduces three apis.
One is added to IAudioService, the others are added
to IHdmiControlService as hidden apis.
1. IAudioService#setHdmiSystemAudioSupported;
This is to notify system audio mode change to audio
service so that it determines to notify volume or mute
change to HdmiControlService.
2. IHdmiControlService#setSystemAudioVolume;
This is to notify volume change to HdmiControlService.
It's called only where system audio mode is on.
3. IHdmiControlService#setSystemAudioMute;
This is to notify volume change to HdmiControlService .
It's called only where system audio mode is on.
Change-Id: I3d8534b37ddf1a812e32012059a8778772044bf0
Jose Lima [Thu, 3 Jul 2014 01:23:34 +0000 (01:23 +0000)]
Merge "Consume HOME key when it is used to dismiss Dream activity"
Jose Lima [Thu, 3 Jul 2014 00:21:51 +0000 (17:21 -0700)]
Consume HOME key when it is used to dismiss Dream activity
Bug:
15002352
Change-Id: I0e86ec62a1a45dd1e68752d36be07355a9c6e2fd
Jean-Michel Trivi [Wed, 2 Jul 2014 16:24:36 +0000 (09:24 -0700)]
Send media button events with FLAG_RECEIVER_FOREGROUND set
bug
11357318
Change-Id: Iccd000bebb31a2f6cb057e97d3ab276861d0b651
Jae Seo [Wed, 2 Jul 2014 20:45:46 +0000 (20:45 +0000)]
Merge "TvContract: Add a field for network affiliation to the Channels table"
Tao Bai [Tue, 1 Jul 2014 19:39:54 +0000 (12:39 -0700)]
Enable new geolocation permission API.
BUG:
14668406
Change-Id: I9500154d14eceae0248eb3718de27fc33fef4f28
Jae Seo [Tue, 1 Jul 2014 21:33:11 +0000 (14:33 -0700)]
TvContract: Add a field for network affiliation to the Channels table
This is used to identify a channel that is commonly called by its
network affiliation instead of the display name.
Bug:
15993156
Change-Id: Ib5a15e0e44e815c98b762573b5a24289a86f9583
Ihab Awad [Wed, 2 Jul 2014 19:55:51 +0000 (19:55 +0000)]
Merge "Rename Telecomm "Subscription" to "Account" (1/7)"
Ihab Awad [Tue, 1 Jul 2014 04:17:13 +0000 (21:17 -0700)]
Rename Telecomm "Subscription" to "Account" (1/7)
Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40
Conflicts:
telecomm/java/android/telecomm/InCallCall.java
Alan Viverette [Thu, 3 Jul 2014 00:06:26 +0000 (00:06 +0000)]
Merge "Update dropdown background asset"
Alan Viverette [Wed, 2 Jul 2014 23:52:01 +0000 (16:52 -0700)]
Update dropdown background asset
BUG:
15985882
Change-Id: I9f271bf99371516bce5bad3e1c3f0efbedc8ffdd
Prerepa Viswanadham [Wed, 2 Jul 2014 19:30:38 +0000 (12:30 -0700)]
Obtain capabilities from chipset for it's support of various features
Change-Id: I01bdb31136be63e4e46fb4e054c902eddc5647ab
Igor Murashkin [Wed, 2 Jul 2014 23:50:02 +0000 (23:50 +0000)]
Merge "camera2: Add crop region support and some other AE tags to legacy"
Igor Murashkin [Wed, 2 Jul 2014 01:06:13 +0000 (18:06 -0700)]
camera2: Add crop region support and some other AE tags to legacy
Change-Id: If7a87b210a57ea13d6329bb363b1c7ecdadc52e8
Ihab Awad [Wed, 2 Jul 2014 21:24:26 +0000 (21:24 +0000)]
Merge "Fix references to two constants"
Ihab Awad [Wed, 2 Jul 2014 20:51:50 +0000 (13:51 -0700)]
Fix references to two constants
The names of two constants missed getting updated in a previous CL,
causing a build breakage.
Change-Id: I2a87f6b3aead2c6b751afedf32a321c8290b51be
Santos Cordon [Wed, 2 Jul 2014 23:40:51 +0000 (23:40 +0000)]
Merge "Move cancelMissedCallsNotification to PhoneManager."
Santos Cordon [Wed, 2 Jul 2014 20:20:40 +0000 (13:20 -0700)]
Move cancelMissedCallsNotification to PhoneManager.
Change-Id: I2ce26e77ef1f0acc11552bf28efc039391e09766
Craig Mautner [Wed, 2 Jul 2014 23:33:09 +0000 (23:33 +0000)]
Merge "Use cached thumbnails in Recent tasks."
Tyler Gunn [Wed, 2 Jul 2014 23:28:30 +0000 (16:28 -0700)]
Adding "start call with video" extra for ACTION_CALL intent.
Bug:
16014224
Change-Id: I6240b50383de60fbe9038b247856227c6c278b85
Craig Mautner [Tue, 1 Jul 2014 19:38:52 +0000 (12:38 -0700)]
Use cached thumbnails in Recent tasks.
The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.
As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.
Fixes bug
15828934.
Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
Jason Sams [Wed, 2 Jul 2014 23:19:27 +0000 (23:19 +0000)]
am
24bea6a3: Resolve conflicts with AOSP.
* commit '
24bea6a3ef53733ffd1622dfa0bdaeea0a74303a':
Resolve conflicts with AOSP.
Baligh Uddin [Wed, 2 Jul 2014 23:19:22 +0000 (23:19 +0000)]
am
ed61958a: (-s ours) am
e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ed61958a254deb6299b907ecb079ebe15da339c3':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 23:19:16 +0000 (23:19 +0000)]
am
0bd94e4b: (-s ours) am
48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0bd94e4b7a5f490dac0090db931bef0f60121cf9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 23:19:12 +0000 (23:19 +0000)]
am
066fb41f: (-s ours) am
caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
066fb41fc74419d321f385f9d641c014efb474ae':
Import translations. DO NOT MERGE
Martijn Coenen [Wed, 2 Jul 2014 23:40:08 +0000 (23:40 +0000)]
Merge "Add API to query for AID prefix support."
Martijn Coenen [Wed, 2 Jul 2014 23:30:06 +0000 (16:30 -0700)]
Add API to query for AID prefix support.
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.
Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
Martijn Coenen [Wed, 2 Jul 2014 20:58:42 +0000 (13:58 -0700)]
Clean up dynamic AID XML parser.
<aid-group> should be generated and parsed
in its own object.
Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
Martijn Coenen [Wed, 2 Jul 2014 19:44:33 +0000 (12:44 -0700)]
Move AID validation to CardEmulation.
More logical place since it's a generic utility
function.
Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
Alan Viverette [Wed, 2 Jul 2014 23:14:19 +0000 (23:14 +0000)]
Merge "Add style for SearchView"
Nick Kralevich [Wed, 2 Jul 2014 23:06:47 +0000 (16:06 -0700)]
resolved conflicts for merge of
dbbc0706 to master
Change-Id: I3b4e442988021d5ac569cb06682bc1355edbb430
Alan Viverette [Wed, 2 Jul 2014 22:46:04 +0000 (15:46 -0700)]
Add style for SearchView
BUG:
6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25
Nick Kralevich [Wed, 2 Jul 2014 22:41:13 +0000 (15:41 -0700)]
resolved conflicts for merge of
a8dbd7b4 to master
Change-Id: I90f42546c6d0a8f21af3041e59baf6a226247b1c
Raph Levien [Wed, 2 Jul 2014 22:18:16 +0000 (22:18 +0000)]
Merge "Fix native crash when typeface is missing"
Raph Levien [Wed, 2 Jul 2014 22:07:39 +0000 (15:07 -0700)]
Fix native crash when typeface is missing
Creating a typeface from a missing file crashes when it tries to extract
the style from the font. This patch just uses default style when the
resulting font object is NULL.
Bug:
15930808
Change-Id: I9438687100026f336db7aa204fe3a0232eee2db6
Martijn Coenen [Wed, 2 Jul 2014 22:01:52 +0000 (22:01 +0000)]
Merge "Clean up dynamic AID XML parser."
Ido Ofir [Wed, 2 Jul 2014 21:33:40 +0000 (21:33 +0000)]
Merge "fixing i18n bug. b/
15711200"
Ido Ofir [Wed, 2 Jul 2014 20:51:01 +0000 (13:51 -0700)]
fixing i18n bug. b/
15711200
Change-Id: I485859f6536c68f3d0d3e2d62c21a39705ba87b4
Martijn Coenen [Wed, 2 Jul 2014 20:28:45 +0000 (20:28 +0000)]
Merge "Move AID validation to CardEmulation."
Adrian Roos [Wed, 2 Jul 2014 20:03:44 +0000 (20:03 +0000)]
Merge "Update QS flashlight icon"
Adrian Roos [Wed, 2 Jul 2014 20:01:32 +0000 (22:01 +0200)]
Update QS flashlight icon
Bug:
15934851
Change-Id: Id1d08fce8916c29c6cb53eee7cb069b250c0b805
dcashman [Wed, 2 Jul 2014 20:03:05 +0000 (20:03 +0000)]
Merge "Initial work for key rotation."
dcashman [Wed, 9 Apr 2014 21:20:38 +0000 (14:20 -0700)]
Initial work for key rotation.
Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk. If no upgrade-keyset is specified, the current logic
involving signatures is used.
Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app. This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.
Bug:
6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
Alexandra Gherghina [Wed, 2 Jul 2014 17:07:16 +0000 (17:07 +0000)]
Merge "Adds per-user APIs required by the Settings app"
Baligh Uddin [Wed, 2 Jul 2014 15:08:10 +0000 (15:08 +0000)]
am
e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
e1ef888eac66c247710833746f7e8e2fc1f45c1b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 15:08:06 +0000 (15:08 +0000)]
am
48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 15:08:02 +0000 (15:08 +0000)]
am
caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
caaf4aed05163df62365d351e592083ba95102cd':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 1 Jul 2014 14:14:11 +0000 (15:14 +0100)]
Adds per-user APIs required by the Settings app
Bug:
15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
Narayan Kamath [Wed, 2 Jul 2014 12:18:45 +0000 (12:18 +0000)]
am
e2840977: am
6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '
e2840977d37e4d19425d448b54895536e43a2989':
Fix native crashes when APKs can't be opened.
Narayan Kamath [Wed, 2 Jul 2014 12:12:18 +0000 (12:12 +0000)]
am
6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '
6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
Fix native crashes when APKs can't be opened.
Narayan Kamath [Wed, 2 Jul 2014 10:09:45 +0000 (10:09 +0000)]
am
39e4f590: am
f56399f6: Merge "Fall back to "tl" if "fil" is absent."
* commit '
39e4f590787246ce35b995c0c0ce37b676a05e0c':
Fall back to "tl" if "fil" is absent.
Narayan Kamath [Wed, 2 Jul 2014 10:00:09 +0000 (10:00 +0000)]
am
f56399f6: Merge "Fall back to "tl" if "fil" is absent."
* commit '
f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
Fall back to "tl" if "fil" is absent.
Narayan Kamath [Wed, 2 Jul 2014 09:54:22 +0000 (09:54 +0000)]
am
94171212: am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
94171212431a45346e40fd97bbe72422e71f04be':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 09:51:54 +0000 (09:51 +0000)]
am
d62196cf: am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
d62196cfeffe5e4d725b5388fca57a18c154a44b':
Remove bogus 2 char limit for locales and countries.
Narayan Kamath [Wed, 2 Jul 2014 08:49:08 +0000 (08:49 +0000)]
am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
104da1e495cbed81e7ebe66b80344bf916b02391':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 08:49:04 +0000 (08:49 +0000)]
am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
3fa99ec77ee52164575375c7709923c94d9693a6':
Remove bogus 2 char limit for locales and countries.
Robert Ly [Wed, 2 Jul 2014 00:22:10 +0000 (00:22 +0000)]
am
9b3bfb10: docs: updated expandedtext_combo
* commit '
9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
docs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:00:58 +0000 (17:00 -0700)]
docs: updated expandedtext_combo
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
Robert Ly [Wed, 2 Jul 2014 00:00:59 +0000 (00:00 +0000)]
am
f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit '
f077e7b719419271b5fd666c22b7d19177d6c325':
docs: add more notification images
Baligh Uddin [Wed, 2 Jul 2014 15:04:32 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Eric Laurent [Wed, 2 Jul 2014 16:46:18 +0000 (16:46 +0000)]
Merge "audio: fixed channel count determination from channel mask"
Eric Laurent [Wed, 2 Jul 2014 01:56:30 +0000 (18:56 -0700)]
audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.
Bug:
15000850.
Change-Id: Id52fc517bedaf1c42b9cd59857e3d19c251b97bf
Baligh Uddin [Wed, 2 Jul 2014 15:04:35 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:24 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Brian Carlstrom [Tue, 1 Jul 2014 22:37:18 +0000 (22:37 +0000)]
am
8922ddba: am
a6e06889: Merge "Add profiler type options"
* commit '
8922ddbab1e394a59f957e8598fbbf88357e7838':
Add profiler type options
Brian Carlstrom [Tue, 1 Jul 2014 22:32:01 +0000 (22:32 +0000)]
am
a6e06889: Merge "Add profiler type options"
* commit '
a6e06889fce7fbf2049f421daef02b8986736f77':
Add profiler type options
Chris Craik [Tue, 1 Jul 2014 22:23:57 +0000 (15:23 -0700)]
Fix klp-modular-dev-plus-aosp build
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
Nick Kralevich [Tue, 1 Jul 2014 21:16:14 +0000 (21:16 +0000)]
am
d172419e: am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
d172419e9a36f61af8c98d316ec2625e1f1304f6':
Allow different SELinux policies for third party apps.
Nick Kralevich [Tue, 1 Jul 2014 21:13:12 +0000 (21:13 +0000)]
am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
Allow different SELinux policies for third party apps.
Santos Cordon [Wed, 2 Jul 2014 18:33:08 +0000 (18:33 +0000)]
Merge "Add PhoneManager to expose functionality to phone/dialer apps."
Santos Cordon [Tue, 1 Jul 2014 20:35:35 +0000 (13:35 -0700)]
Add PhoneManager to expose functionality to phone/dialer apps.
Eventually, this will house the TelecommManager methods.
Change-Id: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
Julia Reynolds [Tue, 1 Jul 2014 15:10:41 +0000 (11:10 -0400)]
Apply DISALLOW_CONFIG_VPN restriction to VPN.
Bug:
16008760
Change-Id: I299d5f32d9b09c3abcc32f3e889a0187880621df