OSDN Git Service
Jonathan Basseri [Fri, 19 Jun 2015 06:29:36 +0000 (06:29 +0000)]
am
cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev
* commit '
cb8bb3900178c126b9f101e84edd07bb6b489637':
Add VVM carrier config to public API.
Jonathan Basseri [Fri, 19 Jun 2015 06:16:46 +0000 (06:16 +0000)]
Merge "Add VVM carrier config to public API." into mnc-dev
Rich Slogar [Fri, 19 Jun 2015 06:02:58 +0000 (06:02 +0000)]
am
e9abb682: am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
e9abb6829f622c19b8cb14e9f68a0e13a8a93272':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 06:02:54 +0000 (06:02 +0000)]
am
940335ba: Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
* commit '
940335ba5b68f3382d7b42ba4fd781c8120bc370':
Wear doesn't need Shell to send notification when bugreport captured.
Rich Slogar [Fri, 19 Jun 2015 05:58:13 +0000 (05:58 +0000)]
am
d9d05fe3: am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
d9d05fe358c96e85149627d955191d1328e9924a':
docs: sdk-tools 24.3.3 updates
Wei Liu [Fri, 19 Jun 2015 05:54:53 +0000 (05:54 +0000)]
Merge "resolved conflicts for merge of
1dac6bd9 to mnc-dev" into mnc-dev
Wei Liu [Fri, 19 Jun 2015 05:52:37 +0000 (22:52 -0700)]
resolved conflicts for merge of
1dac6bd9 to mnc-dev
Change-Id: I000b35f5e2658a065c780396254bcb88f1cbce5e
Shawn Willden [Fri, 19 Jun 2015 03:27:42 +0000 (03:27 +0000)]
am
09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
* commit '
096148087980ea5a92e1b96579900ea36727fbbc':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
Shawn Willden [Fri, 19 Jun 2015 03:16:49 +0000 (03:16 +0000)]
Merge "Reflect removal of KM_TAG_AEAD_TAG from key" into mnc-dev
Selim Cinek [Fri, 19 Jun 2015 01:51:25 +0000 (01:51 +0000)]
am
a353528c: Merge "Added a message to the keyguard bouncer" into mnc-dev
* commit '
a353528c79e0e295a98a79f8672ace6df8647f78':
Added a message to the keyguard bouncer
Alex Klyubin [Fri, 19 Jun 2015 01:43:45 +0000 (18:43 -0700)]
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
This reflects the changes in
da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.
Bug:
19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
Selim Cinek [Fri, 19 Jun 2015 01:40:37 +0000 (01:40 +0000)]
Merge "Added a message to the keyguard bouncer" into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 01:32:38 +0000 (01:32 +0000)]
am
8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
* commit '
8b156e37d5238487f1b3742fe9fb8a0632bfd66c':
BatteryStats: Update external stats individually.
Adam Lesinski [Fri, 19 Jun 2015 01:22:52 +0000 (01:22 +0000)]
Merge "BatteryStats: Update external stats individually." into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 01:20:08 +0000 (01:20 +0000)]
am
d2b9dcac: Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
* commit '
d2b9dcac7ff3b2aafb3a58bf9ef78945a215a6b0':
BatteryStats: Log when WiFi idle time is too large
Christopher Tate [Fri, 19 Jun 2015 01:20:03 +0000 (01:20 +0000)]
am
3233a0a6: Merge "Don\'t always dump domain/preferred state" into mnc-dev
* commit '
3233a0a65c8bd2acce4b8fdfe6ce8e6c20b9a24d':
Don't always dump domain/preferred state
Adam Lesinski [Fri, 19 Jun 2015 01:17:06 +0000 (01:17 +0000)]
Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev
Adam Lesinski [Thu, 18 Jun 2015 21:52:24 +0000 (14:52 -0700)]
BatteryStats: Update external stats individually.
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.
Bug:
21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
Sanket Padawe [Fri, 19 Jun 2015 01:13:09 +0000 (01:13 +0000)]
am
30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
* commit '
30a79ec19064220847f5cdc0e58f83bd4a948930':
Set default PBAP checkbox state to false (checkbox unselected).
Dianne Hackborn [Fri, 19 Jun 2015 01:13:05 +0000 (01:13 +0000)]
am
0348ba2e: Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '
0348ba2e2303d9dce57a6b5d19cc47ecc5089afe':
Fix issue #
20494208: Go out of device idle when headset button is pressed
Christopher Tate [Fri, 19 Jun 2015 01:12:00 +0000 (01:12 +0000)]
Merge "Don't always dump domain/preferred state" into mnc-dev
Christopher Tate [Fri, 19 Jun 2015 01:09:42 +0000 (18:09 -0700)]
Don't always dump domain/preferred state
Change-Id: Ie0431b6c3cb1a9f372a142637359c42b182d4b1b
Adam Lesinski [Fri, 19 Jun 2015 01:05:20 +0000 (18:05 -0700)]
BatteryStats: Log when WiFi idle time is too large
We have issues with bad data coming from the WiFi system, so
log when we have unreasonably large WiFi idle time.
Bug:
21929173
Change-Id: I54b34c5efad14264306155c588f4c3b71cae35df
Sanket Padawe [Fri, 19 Jun 2015 01:03:34 +0000 (01:03 +0000)]
Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
Dianne Hackborn [Fri, 19 Jun 2015 01:01:36 +0000 (01:01 +0000)]
Merge "Fix issue #
20494208: Go out of device idle when headset button is pressed" into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 00:59:28 +0000 (00:59 +0000)]
am
00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit '
00fac63575349df5ed8c399b83f1f9c7199ff070':
BatteryStats: Fix regression in wakelock power distribution
Dan Sandler [Fri, 19 Jun 2015 00:59:24 +0000 (00:59 +0000)]
am
11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
* commit '
11859eba4e0e3c8dc1e2479a83e73dff6536ffc7':
Announce chronometers with time-unit words.
Adam Lesinski [Fri, 19 Jun 2015 00:57:46 +0000 (00:57 +0000)]
Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
Sanket Padawe [Fri, 19 Jun 2015 00:56:08 +0000 (17:56 -0700)]
Set default PBAP checkbox state to false (checkbox unselected).
Bug:
20488109
Change-Id: I6259ea8d048cbface2ba63b8c1077af12d0fee1b
Dan Sandler [Fri, 19 Jun 2015 00:50:57 +0000 (00:50 +0000)]
Merge "Announce chronometers with time-unit words." into mnc-dev
Dianne Hackborn [Fri, 19 Jun 2015 00:40:33 +0000 (17:40 -0700)]
Fix issue #
20494208: Go out of device idle when headset button is pressed
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.
Change-Id: Ie58de60e63036a4142881283835961fbcceec892
Santos Cordon [Fri, 19 Jun 2015 00:19:52 +0000 (00:19 +0000)]
am
fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev
* commit '
fe1fdacf1d256f5f1a5020906bc9c400b99a14bb':
Clean up SIM CallManager APIs.
Santos Cordon [Fri, 19 Jun 2015 00:04:58 +0000 (00:04 +0000)]
Merge "Clean up SIM CallManager APIs." into mnc-dev
Rich Slogar [Thu, 18 Jun 2015 23:55:44 +0000 (23:55 +0000)]
am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
docs: sdk-tools 24.3.3 updates
Rich Slogar [Thu, 18 Jun 2015 23:47:27 +0000 (23:47 +0000)]
Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
Rich Slogar [Tue, 16 Jun 2015 21:22:08 +0000 (14:22 -0700)]
docs: sdk-tools 24.3.3 updates
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
Wei Liu [Thu, 18 Jun 2015 23:24:41 +0000 (23:24 +0000)]
am
ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.
* commit '
ae363d2db4398a695606c254b88be8940139edd1':
Wear doesn't need Shell to send notification when bugreport captured.
Fyodor Kupolov [Thu, 18 Jun 2015 23:23:32 +0000 (23:23 +0000)]
am
7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit '
7e603d69947566bd17ac76820fde59ac9fd11c0c':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Pierre Vandwalle [Thu, 18 Jun 2015 23:23:28 +0000 (23:23 +0000)]
am
0b00db8e: Merge "create Wifi PNO ALARM intent" into mnc-dev
* commit '
0b00db8eebd3b677c1d9190061d0d97dd672976e':
create Wifi PNO ALARM intent
Fyodor Kupolov [Thu, 18 Jun 2015 23:16:42 +0000 (23:16 +0000)]
Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
Santos Cordon [Fri, 12 Jun 2015 22:27:01 +0000 (15:27 -0700)]
Clean up SIM CallManager APIs.
Bug:
21499476
Change-Id: Iaded74c6b885b0745dfa85d0b7733bdad75d615a
Pierre Vandwalle [Thu, 18 Jun 2015 23:13:17 +0000 (23:13 +0000)]
Merge "create Wifi PNO ALARM intent" into mnc-dev
Fyodor Kupolov [Thu, 18 Jun 2015 23:09:38 +0000 (23:09 +0000)]
am
e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev
* commit '
e5bce22dc098d5da9ff573f4aac812272de3c0af':
Defer writes to runtime-permissions.xml
Jonathan Basseri [Thu, 18 Jun 2015 23:05:39 +0000 (16:05 -0700)]
Add VVM carrier config to public API.
These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.
Bug:
21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
Fyodor Kupolov [Thu, 18 Jun 2015 23:00:48 +0000 (23:00 +0000)]
Merge "Defer writes to runtime-permissions.xml" into mnc-dev
Doris Liu [Thu, 18 Jun 2015 22:51:11 +0000 (22:51 +0000)]
am
707ae538: Merge "Fix a typo in Drawable\'s javadoc" into mnc-dev
* commit '
707ae53879b24b49c369419d2cf80c29090d8cb3':
Fix a typo in Drawable's javadoc
Yang Ni [Thu, 18 Jun 2015 22:51:07 +0000 (22:51 +0000)]
am
159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit '
159f442fa3dd620aa91cf390dff8beb9a1141a01':
Unpublish methods in class ScriptGroup.Binding
Todd Kennedy [Thu, 18 Jun 2015 22:51:03 +0000 (22:51 +0000)]
am
f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit '
f29c4a07f42eecb77fbd9acdcf61a26d3480c047':
Add getPackageImportance() system API
Doris Liu [Thu, 18 Jun 2015 22:39:16 +0000 (22:39 +0000)]
Merge "Fix a typo in Drawable's javadoc" into mnc-dev
Yang Ni [Thu, 18 Jun 2015 22:38:58 +0000 (22:38 +0000)]
Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
Todd Kennedy [Thu, 18 Jun 2015 22:37:39 +0000 (22:37 +0000)]
Merge "Add getPackageImportance() system API" into mnc-dev
Jeff Sharkey [Thu, 18 Jun 2015 22:31:46 +0000 (22:31 +0000)]
am
c8a49a2b: Merge "Write packages.list when granting permissions." into mnc-dev
* commit '
c8a49a2b95d6ed182cbc966676d17f98e1ccd816':
Write packages.list when granting permissions.
Alan Viverette [Thu, 18 Jun 2015 22:31:41 +0000 (22:31 +0000)]
am
f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit '
f1da9a1401fe1304bee8a550a0141c79ecc3c0b3':
DO NOT MERGE: Remove DayNight theme
Selim Cinek [Thu, 18 Jun 2015 08:38:59 +0000 (01:38 -0700)]
Added a message to the keyguard bouncer
A message can now be shown on the keyguard bouncer
explaining why the bouncer is being shown.
Bug:
21618072
Change-Id: I25aea9cc242abbf6a133fb42cc4407f5c2f3f688
Doris Liu [Thu, 18 Jun 2015 22:26:17 +0000 (15:26 -0700)]
Fix a typo in Drawable's javadoc
Change-Id: Ic168b250defb30512cb35a836118fe2bdf1b2e78
Todd Kennedy [Thu, 18 Jun 2015 19:54:55 +0000 (12:54 -0700)]
Add getPackageImportance() system API
Callers must have the permission GET_PACKAGE_IMPORTANCE
Bug:
20642684
Change-Id: I6f3ef2ec810c884e0dee239e5909bcb314957302
Jeff Sharkey [Thu, 18 Jun 2015 22:26:55 +0000 (22:26 +0000)]
Merge "Write packages.list when granting permissions." into mnc-dev
Jeff Sharkey [Thu, 18 Jun 2015 22:23:02 +0000 (15:23 -0700)]
Write packages.list when granting permissions.
Some permissions have the side effect of adding GIDs right now,
so we need to flush out packages.list.
Bug:
21874693
Change-Id: Ia4398c9f84cf7f151248f821b3fa2c12bdf91b80
Alan Viverette [Thu, 18 Jun 2015 22:21:46 +0000 (22:21 +0000)]
Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
Alan Viverette [Thu, 18 Jun 2015 22:15:16 +0000 (15:15 -0700)]
DO NOT MERGE: Remove DayNight theme
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.
Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.
Bug:
21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
Paul McLean [Thu, 18 Jun 2015 22:12:30 +0000 (22:12 +0000)]
am
2d5f41e4: Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
* commit '
2d5f41e4c1733ff3e606390a433a6a52be6e862a':
Better handling of 0-length format conversions in convertAudioPortFromNative().
Paul McLean [Thu, 18 Jun 2015 22:00:24 +0000 (22:00 +0000)]
Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
Pierre Vandwalle [Thu, 18 Jun 2015 21:48:39 +0000 (14:48 -0700)]
create Wifi PNO ALARM intent
Change-Id: I9bdae8ae37e30d36bf82b731468b8a157bb2862b
Alan Viverette [Thu, 18 Jun 2015 21:47:31 +0000 (21:47 +0000)]
am
b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
* commit '
b0ff3a6cb37aa45add4b0c5135bd978442fcc441':
Ensure ResolverDrawerLayout is visible to accessibility services
Paul McLean [Thu, 18 Jun 2015 19:47:34 +0000 (12:47 -0700)]
Better handling of 0-length format conversions in convertAudioPortFromNative().
Bug:
21915588
Change-Id: I8eb3da2bfa94722a11cf47ba6fc5359d5e8e4916
Alan Viverette [Thu, 18 Jun 2015 21:37:53 +0000 (21:37 +0000)]
Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
Mike Lockwood [Thu, 18 Jun 2015 21:21:38 +0000 (21:21 +0000)]
am
3c525c15: Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-dev
* commit '
3c525c15cb14483aa17825ca92d100fba398f1a0':
Fix MidiDevice.MidiConnection lifecycle
Alan Viverette [Thu, 18 Jun 2015 21:20:35 +0000 (14:20 -0700)]
Ensure ResolverDrawerLayout is visible to accessibility services
Also removes the class name since it's not helpful to expose framework
internal class names to accessibility services that can't access them.
Bug:
18864087
Change-Id: If9b29d3929970bd893168444584a5dd1ba593c5b
John Spurlock [Thu, 18 Jun 2015 21:15:48 +0000 (21:15 +0000)]
am
76ac3238: Merge "AudioService: Send the right stream to the volume UI on tablet changes." into mnc-dev
* commit '
76ac32389360695ede23a9403aeb19bd3746e74d':
AudioService: Send the right stream to the volume UI on tablet changes.
Mike Lockwood [Thu, 18 Jun 2015 21:13:26 +0000 (21:13 +0000)]
Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-dev
John Spurlock [Thu, 18 Jun 2015 21:05:21 +0000 (21:05 +0000)]
Merge "AudioService: Send the right stream to the volume UI on tablet changes." into mnc-dev
Christopher Tate [Thu, 18 Jun 2015 21:02:18 +0000 (21:02 +0000)]
am
728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev
* commit '
728b7500b3d34cd89f7aff0bad1bb7fe3e097f11':
Document possible null returns in PackageManager
Chien-Yu Chen [Thu, 18 Jun 2015 20:54:38 +0000 (20:54 +0000)]
am
aca98de4: Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
* commit '
aca98de43368a68d1d47c205d8ec8395d4b81376':
ImageWriter: Remove exception for closing twice
Christopher Tate [Thu, 18 Jun 2015 20:53:10 +0000 (20:53 +0000)]
Merge "Document possible null returns in PackageManager" into mnc-dev
Christopher Tate [Thu, 18 Jun 2015 20:47:04 +0000 (13:47 -0700)]
Document possible null returns in PackageManager
In particular queryIntentServices() but also a few others.
Bug
19127758
Change-Id: I590605ce4870b2ab300385678df8917cfade60f9
Chien-Yu Chen [Thu, 18 Jun 2015 20:42:19 +0000 (20:42 +0000)]
Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
Dan Sandler [Thu, 18 Jun 2015 20:35:45 +0000 (20:35 +0000)]
am
50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
* commit '
50ec9b1bd97a04a001dd394885db0cc6f13bea39':
Patch up certain kinds of broken notifications.
Dan Sandler [Thu, 18 Jun 2015 20:26:47 +0000 (20:26 +0000)]
Merge "Patch up certain kinds of broken notifications." into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 20:23:13 +0000 (20:23 +0000)]
am
71b44259: Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
* commit '
71b44259829cbc0f6480a1cda68fb9183a0d0ad9':
GetInstalledProvidersForProfiles should never return null object.
Vineeta Srivastava [Thu, 18 Jun 2015 20:23:09 +0000 (20:23 +0000)]
am
7105fd43: Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
* commit '
7105fd43d288eaa834f2f8cc054cddc6b54af7c4':
Add config_tether_apndata for Canada MVNO
Hyunyoung Song [Thu, 18 Jun 2015 20:13:34 +0000 (20:13 +0000)]
Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
Vineeta Srivastava [Thu, 18 Jun 2015 20:12:28 +0000 (20:12 +0000)]
Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 20:10:01 +0000 (20:10 +0000)]
am
3358eb08: Merge "Add way to get the network location provider package" into mnc-dev
* commit '
3358eb084eb445e30d80e4a64d19af901059c399':
Add way to get the network location provider package
Stefan Kuhne [Thu, 18 Jun 2015 20:09:56 +0000 (20:09 +0000)]
am
0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
* commit '
0925136b22d4fcc69ed8b13675861e2386f3a341':
Fixing voice panel centering issues in landscape on phone
Chris Wren [Thu, 18 Jun 2015 20:09:52 +0000 (20:09 +0000)]
am
5e275f9f: Merge "instrument volume controls" into mnc-dev
* commit '
5e275f9fc0e655a273fc62ce297c9d5a069d7ed7':
instrument volume controls
Jason Monk [Thu, 18 Jun 2015 20:03:28 +0000 (20:03 +0000)]
Merge "Add way to get the network location provider package" into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 19:59:51 +0000 (12:59 -0700)]
GetInstalledProvidersForProfiles should never return null object.
b/
21916365
b/
19904873
Change-Id: I296cafd15a185ad91cb7491bd6d2466ac03cdfb7
Stefan Kuhne [Thu, 18 Jun 2015 19:58:16 +0000 (19:58 +0000)]
Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
Chris Wren [Thu, 18 Jun 2015 19:57:48 +0000 (19:57 +0000)]
Merge "instrument volume controls" into mnc-dev
Sanket Padawe [Thu, 18 Jun 2015 19:51:50 +0000 (19:51 +0000)]
am
3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
* commit '
3fa285f93e2810cbd31a71490b364be2b6636d9d':
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
Jason Monk [Thu, 18 Jun 2015 19:45:15 +0000 (19:45 +0000)]
am
aa2a1966: Merge "Fix some demo mode issues" into mnc-dev
* commit '
aa2a19661de088278819fb5b5670ebcada5733f9':
Fix some demo mode issues
John Spurlock [Thu, 18 Jun 2015 19:45:07 +0000 (15:45 -0400)]
AudioService: Send the right stream to the volume UI on tablet changes.
Bug:
21798314
Change-Id: Idd49eb9e1253a94e567866a38b664035aea3715b
Sanket Padawe [Thu, 18 Jun 2015 19:42:49 +0000 (19:42 +0000)]
Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:32:02 +0000 (19:32 +0000)]
Merge "Fix some demo mode issues" into mnc-dev
Mike Lockwood [Thu, 18 Jun 2015 17:05:17 +0000 (10:05 -0700)]
Fix MidiDevice.MidiConnection lifecycle
Update device server's MidiDeviceStatus when a connection is made to one of its output ports.
After connecting an input port to an output port using MidiDevice.connectPorts(),
do not call IMidiDeviceServer.closePort() until MidiDevice.MidiConnection.close() is called.
While I was in there, added missing CloseGuard support to the MidiDevice.MidiConnection class.
This fixes a problem resulting in UsbMidiDevice closing the device's ALSA driver too soon.
Bug:
21850709
Change-Id: I0c120f76b42eec8a143161e46dba73fbec5e4f31
Jason Monk [Thu, 18 Jun 2015 19:29:46 +0000 (19:29 +0000)]
am
7f274f0e: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
7f274f0e1d11e5e70cd55ed93aa467389445636a':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 18:07:26 +0000 (14:07 -0400)]
Fix some demo mode issues
Bug:
21919885
Change-Id: If79d76a2954b62e290691b1c2338d175fdbbffc5
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev
Dan Sandler [Wed, 17 Jun 2015 19:09:48 +0000 (15:09 -0400)]
Patch up certain kinds of broken notifications.
Notifications in which the icon resource ID is changed after
Builder.build() is called (even, and particularly, as the
last step in the current implementation of
setLatestEventInfo()) were not having their icons properly
parceled. In these cases we now attempt to catch this at
parcel time and construct the necessary Icon object.
But wait! Parceling does not require a Context. So we don't
actually know which package to load the resource from.
Therefore we now allow an Icon to be constructed with an
empty ("") package name, which allows us to complete this
parceling task despite the fact that a Notification does not
know its own package name. (In case you attempt to load a
drawable for such an Icon, loadDrawable will spot the ""
package and instead substitute the Context from its
parameters to try to load the resource.)
As it happens, even though the Notification does not know
its own package name, BaseStatusBar does, because it was
provided at NM.notify() time and is therefore included in
the StatusBarNotification structure. So we can actually
patch up the Icon (if it is TYPE_RESOURCE) and be sure to
get the icon loaded out of the correct package.
While we've got the hood open, this change fixes a couple of
related problems:
• Foreground service notifications synthetically
constructed for naughty icon==0 notifications (which we
are still allowing...FOR NOW) were losing the
FLAG_FOREGROUND_SERVICE flag (because we're
re-build()-ing them from scratch rather than rewriting
the provided Notification object). Now we set the flag
and hang onto the new notification for next time
setForeground() is called.
• We now allow media notifications to avoid getting bumped
to the top of the notification list if they're
PRIORITY_MIN. You might want to do that, I guess?
Bug:
21333763
Change-Id: Ia5d1f1acb594c7677bcc75ee3d624da4ffca671f
Adam Lesinski [Wed, 17 Jun 2015 22:39:43 +0000 (15:39 -0700)]
BatteryStats: Fix regression in wakelock power distribution
We used to give 50% of the cpu time of each app to any app holding a wakelock
while the screen is off.
Since we switched to the new kernel module for measuring app's cpu time, this distribution
was lost.
Bug:
21876567
Change-Id: I42c294547f63d150d9929271ca0e27fedaaa9d77