Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,981 Commits 3 Branches 0 Tags
902cc578a440eb957bc5ef387b8fd0f1c0640bff
Commit Graph

44614 Commits

Author SHA1 Message Date
Jeremy Joslin
902cc578a4 am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
  Don't send the same PendingIntent more than once.
 2014-12-09 01:00:09 +00:00
Dianne Hackborn
9b07ba1990 am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit '0cfdd810ded6f8486a6b0a61044594f58ab5c052':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-09 00:59:01 +00:00
Eino-Ville Talvala
18f5141dd8 am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit 'b71d983a7ff7ba0d993c32692035ae92db0c9a44':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-09 00:19:23 +00:00
Eino-Ville Talvala
e50e596e50 am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
  Fix docs build
 2014-12-09 00:19:15 +00:00
Pavel Zhamaitsiak
0cec63a283 am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-09 00:18:39 +00:00
Justin Harrison
04e8a5fb4c am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client
 2014-12-09 00:18:35 +00:00
Fyodor Kupolov
77779aa3a5 am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
  Added isRemovingAdmin method
 2014-12-09 00:18:21 +00:00
Benjamin Franz
9c0e993d4e am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
  Change the routing path of bluetooth headset connections.
 2014-12-09 00:17:44 +00:00
Filip Gruszczynski
0b6ccb4102 am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-09 00:17:18 +00:00
Raph Levien
e04cfa8aa5 am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '1918d0276ad502e45944bd75a187dd22021790c5':
  Change Linkify leniency to VALID
 2014-12-09 00:17:09 +00:00
Svetoslav
f2cc4e95b5 am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'f477aeb367f05a64a03ed09efc9e0a9d6f9a6ec2':
  Ensure all events from a showing window are dispatched.
 2014-12-09 00:16:48 +00:00
Chet Haase
dda0529bd5 am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
  Fix seeking behavior
 2014-12-09 00:16:20 +00:00
Zhentao Sun
af67d49865 am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-09 00:16:01 +00:00
Raph Levien
1a91d8df50 resolved conflicts for merge of b9d21d62 to master 
Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2
 2014-12-08 13:46:15 -08:00
Jeremy Joslin
d4753450f3 am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.
 2014-12-08 19:36:27 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-08 19:17:38 +00:00
Eino-Ville Talvala
cfdc0762e2 am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
  Fix docs build
 2014-12-08 19:17:31 +00:00
Pavel Zhamaitsiak
913c989546 am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-08 19:16:43 +00:00
Justin Harrison
e0b2fa5c57 am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
  Add UUID for Pbap client
 2014-12-08 19:16:37 +00:00
Fyodor Kupolov
d483a85e69 am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method
 2014-12-08 19:16:12 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Filip Gruszczynski
5ae61a811a am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-08 19:13:39 +00:00
Raph Levien
1918d0276a am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
  Change Linkify leniency to VALID
 2014-12-08 19:13:14 +00:00
Svetoslav
f477aeb367 am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.
 2014-12-08 19:12:22 +00:00
Chet Haase
0a8cc945ce am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit 'b29c6299704ffd3885be6347bf85058010e24868':
  Fix seeking behavior
 2014-12-08 19:11:33 +00:00
Zhentao Sun
b97782f2da am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-08 19:09:36 +00:00
Raph Levien
b9d21d623f am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev 
* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
  Fix off-by-one error in computeEllipsis
 2014-12-08 19:09:18 +00:00
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
Jeremy Joslin
c4b2ec1a3a am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit '1edc73aa5dc24db39ec685f1950c5110699e301e':
  Don't send the same PendingIntent more than once.
 2014-12-06 02:10:33 +00:00
Jeremy Joslin
1edc73aa5d Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev 2014-12-06 02:05:22 +00:00
Dianne Hackborn
e52a2ea03b am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit '0029f0ac36c28b60d59d3d70d148ba3136971b95':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-05 23:01:01 +00:00
Jeremy Joslin
7929484dbf Don't send the same PendingIntent more than once. 
Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7
 2014-12-05 14:58:04 -08:00
Dianne Hackborn
0029f0ac36 Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 2014-12-05 22:54:08 +00:00
Dianne Hackborn
1e01d16982 Fix issue #17323751: Additional items in aggregated battery stats 
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
 2014-12-05 13:54:24 -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
Eino-Ville Talvala
4b905ad436 am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '2ff214b603939af60cae11727e189eb350b34c39':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-05 20:58:56 +00:00
Eino-Ville Talvala
3e3ae5b715 am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit '0aaf843c8cdcbcce9f491bf8734a4b75fec2ad6b':
  Fix docs build
 2014-12-05 20:58:51 +00:00
Eino-Ville Talvala
2ff214b603 Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 2014-12-05 20:54:08 +00:00
Eino-Ville Talvala
0aaf843c8c Merge "Fix docs build" into lmp-mr1-dev 2014-12-05 20:53:46 +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
Pavel Zhamaitsiak
d89f0d3d54 am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'b81ce34af33ce940846e71878279f9482037cb39':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-05 19:44:53 +00:00
Justin Harrison
87797c056c am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit '4a9cecb1f0bb6f5f949f33c5f07be6d995f4cf24':
  Add UUID for Pbap client
 2014-12-05 19:44:48 +00:00
Pavel Zhamaitsiak
b81ce34af3 Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 2014-12-05 19:42:11 +00:00
Justin Harrison
4a9cecb1f0 Merge "Add UUID for Pbap client" into lmp-mr1-dev 2014-12-05 19:41:55 +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