OSDN Git Service
Dan Sandler [Fri, 19 Jun 2015 13:58:04 +0000 (13:58 +0000)]
am
7a7e8fc8: am
11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
* commit '
7a7e8fc83c5b362427aa061002e928ab7f7721cf':
Announce chronometers with time-unit words.
Santos Cordon [Fri, 19 Jun 2015 13:57:52 +0000 (13:57 +0000)]
am
b32fe52c: am
fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev
* commit '
b32fe52c25eac655d7e1979adf0b42f46043181b':
Clean up SIM CallManager APIs.
Fyodor Kupolov [Fri, 19 Jun 2015 13:57:15 +0000 (13:57 +0000)]
am
bf591b89: am
7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
* commit '
bf591b899426617720fff40256b92aee691a9cc5':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Pierre Vandwalle [Fri, 19 Jun 2015 13:57:10 +0000 (13:57 +0000)]
am
7c74c944: am
0b00db8e: Merge "create Wifi PNO ALARM intent" into mnc-dev
* commit '
7c74c944a7c675f0394a784a13f612c668ac59b3':
create Wifi PNO ALARM intent
Fyodor Kupolov [Fri, 19 Jun 2015 13:57:01 +0000 (13:57 +0000)]
am
01caa29a: am
e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev
* commit '
01caa29a870a1f5b27d7758775cbe04da87871b0':
Defer writes to runtime-permissions.xml
Doris Liu [Fri, 19 Jun 2015 13:56:49 +0000 (13:56 +0000)]
am
59c82ee3: am
707ae538: Merge "Fix a typo in Drawable\'s javadoc" into mnc-dev
* commit '
59c82ee3d2fc3a51928738eb3bd44d513efdeb99':
Fix a typo in Drawable's javadoc
Yang Ni [Fri, 19 Jun 2015 13:56:44 +0000 (13:56 +0000)]
am
44095579: am
159f442f: Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev
* commit '
44095579186a59b6856af665a6b30743e35a2b7b':
Unpublish methods in class ScriptGroup.Binding
Todd Kennedy [Fri, 19 Jun 2015 13:56:40 +0000 (13:56 +0000)]
am
24cd7b03: am
f29c4a07: Merge "Add getPackageImportance() system API" into mnc-dev
* commit '
24cd7b0302b52989236637a0a1451939e635b717':
Add getPackageImportance() system API
Jeff Sharkey [Fri, 19 Jun 2015 13:56:28 +0000 (13:56 +0000)]
am
e5ab13b6: am
c8a49a2b: Merge "Write packages.list when granting permissions." into mnc-dev
* commit '
e5ab13b616d130622098a7c868cae3f94646d9e7':
Write packages.list when granting permissions.
Alan Viverette [Fri, 19 Jun 2015 13:56:23 +0000 (13:56 +0000)]
am
afc21d72: am
f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit '
afc21d72d87390ed0b175c007248c32c5813d1ff':
DO NOT MERGE: Remove DayNight theme
Paul McLean [Fri, 19 Jun 2015 13:56:06 +0000 (13:56 +0000)]
am
fcff4c38: am
2d5f41e4: Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
* commit '
fcff4c382dd0efe37f3e603820bf4a7077b65dba':
Better handling of 0-length format conversions in convertAudioPortFromNative().
Alan Viverette [Fri, 19 Jun 2015 13:55:57 +0000 (13:55 +0000)]
am
ed113f18: am
b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
* commit '
ed113f1848191bf6baf63d00efe2620e7e7d1a35':
Ensure ResolverDrawerLayout is visible to accessibility services
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.
Dan Sandler [Fri, 19 Jun 2015 00:50:57 +0000 (00:50 +0000)]
Merge "Announce chronometers with time-unit words." into mnc-dev
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
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
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
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:28:15 +0000 (21:28 +0000)]
am
36a9663d: am
3c525c15: Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-dev
* commit '
36a9663de89ba224ecdd15e3bad1c7d5adc07c52':
Fix MidiDevice.MidiConnection lifecycle
John Spurlock [Thu, 18 Jun 2015 21:28:11 +0000 (21:28 +0000)]
am
a3a0bb4b: am
76ac3238: Merge "AudioService: Send the right stream to the volume UI on tablet changes." into mnc-dev
* commit '
a3a0bb4ba1fc09af5e5d8a59ef041324a2ca9e43':
AudioService: Send the right stream to the volume UI on tablet changes.
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
Christopher Tate [Thu, 18 Jun 2015 21:09:39 +0000 (21:09 +0000)]
am
528e9abe: am
728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev
* commit '
528e9abeef938179f58714cc3fea4bb8362fd9b6':
Document possible null returns in PackageManager
Chien-Yu Chen [Thu, 18 Jun 2015 21:09:35 +0000 (21:09 +0000)]
am
df1745a1: am
aca98de4: Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
* commit '
df1745a12bd68f6376a82404a8a4839c43ccd316':
ImageWriter: Remove exception for closing twice
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
Dan Sandler [Thu, 18 Jun 2015 20:47:35 +0000 (20:47 +0000)]
am
8c1ce34b: am
50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
* commit '
8c1ce34b715db2aa3f714540e3735c7b41a4953d':
Patch up certain kinds of broken notifications.
Chien-Yu Chen [Thu, 18 Jun 2015 20:42:19 +0000 (20:42 +0000)]
Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 20:36:46 +0000 (20:36 +0000)]
am
847bcd3a: am
71b44259: Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
* commit '
847bcd3a6dd46fd19984bdb68374cee4c4d36b84':
GetInstalledProvidersForProfiles should never return null object.
Vineeta Srivastava [Thu, 18 Jun 2015 20:36:42 +0000 (20:36 +0000)]
am
10161add: am
7105fd43: Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
* commit '
10161addd51f5eb65d945fa1832b3aa34892b936':
Add config_tether_apndata for Canada MVNO
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
Jason Monk [Thu, 18 Jun 2015 20:22:23 +0000 (20:22 +0000)]
am
54dedc4d: am
3358eb08: Merge "Add way to get the network location provider package" into mnc-dev
* commit '
54dedc4de4a3623ac7f4c4cfcdf11aca65d2035f':
Add way to get the network location provider package
Stefan Kuhne [Thu, 18 Jun 2015 20:22:19 +0000 (20:22 +0000)]
am
55353cfb: am
0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
* commit '
55353cfbdc70365c3a9cce5700111d4033416aad':
Fixing voice panel centering issues in landscape on phone
Chris Wren [Thu, 18 Jun 2015 20:22:15 +0000 (20:22 +0000)]
am
6d1aa6d5: am
5e275f9f: Merge "instrument volume controls" into mnc-dev
* commit '
6d1aa6d52ea51b6c89cf5dfb61b51e96476bcc45':
instrument volume controls
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
Sanket Padawe [Thu, 18 Jun 2015 19:59:46 +0000 (19:59 +0000)]
am
87fba5b6: am
3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
* commit '
87fba5b680573e305f934dd1de596618d515a517':
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
Jason Monk [Thu, 18 Jun 2015 19:59:41 +0000 (19:59 +0000)]
am
ea44079e: am
aa2a1966: Merge "Fix some demo mode issues" into mnc-dev
* commit '
ea44079e196b28554d946d5942a1e6a1713e2c1e':
Fix some demo mode issues
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:37:33 +0000 (19:37 +0000)]
am
34496264: am
7f274f0e: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
3449626471e2c0946af3a88e3b3e08a94692d481':
Fix opening secured networks from QS
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
Sanket Padawe [Thu, 18 Jun 2015 19:08:01 +0000 (12:08 -0700)]
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
bug:
21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
Selim Cinek [Thu, 18 Jun 2015 19:04:18 +0000 (19:04 +0000)]
am
85be8992: am
b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev
* commit '
85be8992a989b5bd1a4aa953c42a6b8acaae9675':
Fixed a potential bug where the keyguard could become empty
Selim Cinek [Thu, 18 Jun 2015 19:04:13 +0000 (19:04 +0000)]
am
cdfe2ef6: am
d6efd00a: Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev
* commit '
cdfe2ef66abfff8e2fbc182966a44b557de23cad':
Canceling expand animations as well when starting QS expansion
Selim Cinek [Thu, 18 Jun 2015 19:04:09 +0000 (19:04 +0000)]
am
cddd3119: am
4c2e9ab9: Merge "Fixed another crash with HUNs" into mnc-dev
* commit '
cddd311948123a5a052aa0fd8ff3efa151df9617':
Fixed another crash with HUNs
Chien-Yu Chen [Thu, 18 Jun 2015 18:55:18 +0000 (11:55 -0700)]
ImageWriter: Remove exception for closing twice
because close() will be called again when GC kicks in.
Bug:
20945169
Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
Selim Cinek [Thu, 18 Jun 2015 18:51:21 +0000 (18:51 +0000)]
am
b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev
* commit '
b0a8d2c4aecb6dfe5f7a95f56ca739fbea6301e5':
Fixed a potential bug where the keyguard could become empty
Selim Cinek [Thu, 18 Jun 2015 18:51:17 +0000 (18:51 +0000)]
am
d6efd00a: Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev
* commit '
d6efd00a6aa78eaf0db34228a5a5846c756ab88b':
Canceling expand animations as well when starting QS expansion
Selim Cinek [Thu, 18 Jun 2015 18:51:13 +0000 (18:51 +0000)]
am
4c2e9ab9: Merge "Fixed another crash with HUNs" into mnc-dev
* commit '
4c2e9ab911855e9dabfcbb0478f167c734a6dacf':
Fixed another crash with HUNs
Stefan Kuhne [Thu, 18 Jun 2015 17:20:33 +0000 (07:20 -1000)]
Fixing voice panel centering issues in landscape on phone
The new assist panel (long press on home) was not centered in landscape
mode on phones. This was caused by ignoring the stable insets in the
PhoneWindowManager.
bug:
21708971
Change-Id: I97a968a41c2966b09eba496fbe57c840affdf9ec
Alan Viverette [Thu, 18 Jun 2015 18:43:22 +0000 (18:43 +0000)]
am
8d207165: am
49e11f80: Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
* commit '
8d207165e51e97c5de5a2075e7f5eae55c94125a':
Clear/restore calling identity in AccessibilityInteractionClient
Selim Cinek [Thu, 18 Jun 2015 18:42:58 +0000 (18:42 +0000)]
Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev