Mike Lockwood
210d9d94cf
Merge "MIDI Manager work in progress"
2014-12-08 18:46:38 +00:00
Mike Lockwood
67f8e8bd89
MIDI Manager work in progress
...
Still to do:
Add MidiInputPort and MidiOutputPort classes
Schedule sending MIDI events in the future
Security/permissions
Reconsider interface for virtual devices
Look into performance optimizations
Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8
2014-12-08 10:45:37 -08:00
Wale Ogunwale
ea3c7df59a
am af3361bb: am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
...
* commit 'af3361bb264d9d037f0bd10532a752bbaeaec39c':
Add support from restoring recent's backup.
2014-12-05 21:49:31 +00:00
Wale Ogunwale
af3361bb26
am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
...
* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
Add support from restoring recent's backup.
2014-12-05 21:41:03 +00:00
Prerepa Viswanadham
fd5e847cb6
am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 21:19:53 +00:00
Prerepa Viswanadham
12120998f8
am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 20:18:38 +00:00
Adam Powell
5cd6f61f7d
am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
...
* commit '19623538735fac497325e2082a0ba56c199fc6b1':
Fix NullPointerException in ListView
2014-12-05 19:48:05 +00:00
Adam Powell
1962353873
am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"
...
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
Fix NullPointerException in ListView
2014-12-05 19:39:25 +00:00
Adam Powell
8c9283f410
Merge "Fix NullPointerException in ListView"
2014-12-05 19:26:18 +00:00
Mike Lockwood
6d37adf83d
am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit 'a6e14c8293ef470e29541500506de15d61ab6bf0':
Dont call close in in BluetoothA2dp finalize
2014-12-05 00:15:42 +00:00
John Reck
1022888d33
resolved conflicts for merge of 203c8171 to master
...
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
2014-12-04 16:06:34 -08:00
Yin-Chia Yeh
18be00f77a
Camera2: add toString implementation of LensShadingMap
...
Change-Id: Icecde57e92c2962ed6b1585c0e3fd889b2587736
2014-12-04 15:53:17 -08:00
Mike Lockwood
a6e14c8293
am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize
2014-12-04 22:45:07 +00:00
Wale Ogunwale
9a3f6ac63c
am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
...
* commit '6b54d38a2c859f1c2cc176d1d9a33837cfc351db':
Add support from restoring recent's backup.
2014-12-04 22:06:56 +00:00
Wale Ogunwale
6b54d38a2c
Merge "Add support from restoring recent's backup." into lmp-mr1-dev
2014-12-04 21:58:51 +00:00
Craig Mautner
95cce9d57e
am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
...
* commit '93d47b4c05585c37117ac5ac44d810de63f9d008':
Avoid system server crash due to package removed
2014-12-04 21:58:07 +00:00
Erik Kline
0f3c0704c5
am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '180a30aa57e0790453944533dc442704f7596f65':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:55:38 +00:00
Cheuksan Wang
412766a7d6
am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
new SMS/MMS carrier app API
2014-12-04 21:55:19 +00:00
John Reck
9fb42f0778
resolved conflicts for merge of a75b0ad3 to master
...
Change-Id: I32a2d129c556407727ada909daa6470309d42499
2014-12-04 13:51:41 -08:00
Craig Mautner
93d47b4c05
Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
2014-12-04 21:50:15 +00:00
Derek Sollenberger
203c817180
am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 21:46:39 +00:00
Erik Kline
180a30aa57
am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Cheuksan Wang
29ac679f9f
am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API
2014-12-04 21:45:08 +00:00
Mike Lockwood
448403b7a4
Merge "Dont call close in in BluetoothA2dp finalize"
2014-12-04 21:41:13 +00:00
John Reck
a75b0ad384
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp
...
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
2014-12-04 13:41:04 -08:00
Christopher Tate
1d94907c77
am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
Adjust wallpaper-restore acceptance criteria
2014-12-04 21:23:43 +00:00
Christopher Tate
dff5580711
am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
Adjust wallpaper-restore acceptance criteria
2014-12-04 21:17:37 +00:00
Eino-Ville Talvala
1aef3b1eb4
am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
Revert "Camera: Add new capability flags as system features as well"
2014-12-04 20:44:58 +00:00
Dianne Hackborn
c22369be46
am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
...
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
Fix issue #17948584 : Application crash and phone restart when app...
2014-12-04 20:44:53 +00:00
Yin-Chia Yeh
e01ae15296
am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
...
* commit 'e168dd28f8fedc921e8b08bdce71c20ab60966ee':
Camera: update antibanding spec
2014-12-04 20:44:39 +00:00
Wale Ogunwale
18795a2299
Add support from restoring recent's backup.
...
Bug: 15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
2014-12-04 12:37:53 -08:00
Eino-Ville Talvala
431b65d11f
am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
Revert "Camera: Add new capability flags as system features as well"
2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3
am e6333e51: am f696efa2: Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
...
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
Fix issue #17948584 : Application crash and phone restart when app...
2014-12-04 20:23:25 +00:00
Yin-Chia Yeh
e168dd28f8
am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
...
* commit '871571ae0c4d8f334265b99e274892346756d51b':
Camera: update antibanding spec
2014-12-04 20:23:00 +00:00
Prerepa Viswanadham
e21aafab0d
am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit 'ff5e5db319785d23d672af95ac2dff3f37827cfd':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-04 19:25:02 +00:00
Prerepa Viswanadham
ff5e5db319
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.
Bug 18395071
Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
2014-12-04 18:30:03 +00:00
Derek Sollenberger
c1a2f38ce0
am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 15:17:01 +00:00
Erik Kline
95b5ca9019
am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 15:16:04 +00:00
Cheuksan Wang
dba26aa2e7
am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '109ec376da86de1275f73fa432d6344431a457e9':
new SMS/MMS carrier app API
2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
...
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
2014-12-04 15:15:27 +00:00
Christopher Tate
e808d2df76
am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
Adjust wallpaper-restore acceptance criteria
2014-12-04 15:14:43 +00:00
Derek Sollenberger
4d9da135ca
Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
2014-12-04 13:04:52 +00:00
Erik Kline
9261d9d645
Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
2014-12-04 03:14:02 +00:00
louis_chang
dfa34cd517
Avoid system server crash due to package removed
...
Cherry-picked from aosp.
Fixes bug 18593178.
Symptom:
When application is not responding, an ANR dialog will shown.
In certain timing, user uninstall the application when the ANR
occurs, but before ANR dialog shown. The system server will crash
when looking up the errorReportReceiver because the package is removed.
Here shows how the exception occurs.
java.lang.IllegalArgumentException: Unknown package: app.package.name
at com.android.server.pm.Settings.getInstallerPackageNameLPr
at com.android.server.pm.PackageManagerService.getInstallerPackageName
at android.app.ApplicationPackageManager.getInstallerPackageName
at android.app.ApplicationErrorReport.getErrorReportReceiver
at com.android.server.am.ActivityManagerService.startAppProblemLocked
at com.android.server.am.ActivityManagerService.makeAppNotRespondingLocked
at com.android.server.am.ActivityManagerService.appNotResponding
Change-Id: Iced4287bd44dc25b1db2c1e3a583892eb6c041a2
2014-12-03 16:46:23 -08:00
Cheuksan Wang
109ec376da
Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
2014-12-04 00:19:06 +00:00
John Reck
bd15e4f59c
Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
2014-12-04 00:08:16 +00:00
Christopher Tate
758f45217d
Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
2014-12-03 23:09:34 +00:00
Eino-Ville Talvala
6e21817b8e
am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
Revert "Camera: Add new capability flags as system features as well"
2014-12-03 23:00:15 +00:00
Eino-Ville Talvala
d23f8b44d5
Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
2014-12-03 22:01:42 +00:00
Sreeram Ramachandran
16d75742fc
am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
Fix docs per API review.
2014-12-03 21:51:05 +00:00