Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,900 Commits 3 Branches 0 Tags
ef10307e4a4942c5867ba696e12e13556ac7a716
Commit Graph

47007 Commits

Author SHA1 Message Date
John Spurlock
ef10307e4a am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 19:43:38 +00: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
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 16:52:49 +00:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions. 
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
 2014-12-08 11:00:57 -05: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
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
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
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
Fyodor Kupolov
fed2812dc9 am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit '22afe6261aab343070b63c60a1f4c7ce6f4383f9':
  Added isRemovingAdmin method
 2014-12-05 19:36:26 +00:00
Eino-Ville Talvala
f4eac12954 Camera2: Add HDR scene mode for backwards compatibility. 
To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I35c164563379f7f820b42c674bd91f706061170c
 2014-12-05 11:31:08 -08:00
Fyodor Kupolov
22afe6261a Merge "Added isRemovingAdmin method" into lmp-mr1-dev 2014-12-05 19:28:12 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Eino-Ville Talvala
5a5afe010d Fix docs build 
Change-Id: I9947d53aeb155d98f5194c9789f19aba1f01e4be
 2014-12-05 11:11:55 -08:00
Erik Kline
e660e27603 Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev" 
This is the revert of ag/572619.

This reverts commit 9261d9d645, reversing
changes made to 32b61ab28f.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
 2014-12-05 18:02:56 +00:00
Benjamin Franz
5f1ea2e68b am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit 'fb967585cc43937a88b0ed9a5e434a50b0a498b9':
  Change the routing path of bluetooth headset connections.
 2014-12-05 12:11:23 +00:00
Benjamin Franz
fb967585cc Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 2014-12-05 12:04:03 +00:00
Filip Gruszczynski
f5d1cf0b19 am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit '26af8c197c17487ac0400a7a3310037e57eda2a0':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-05 02:40:38 +00:00
Filip Gruszczynski
26af8c197c am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit '26b187711fdf6224e14df465a58f30f510011b49':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-05 02:34:26 +00:00
Raph Levien
8aa97d26e4 am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '238efad04bfd144942b363c8589004ba831f3c63':
  Change Linkify leniency to VALID
 2014-12-05 02:19:38 +00:00
Raph Levien
238efad04b Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 2014-12-05 02:14:52 +00:00
Fyodor Kupolov
96fb932666 Added isRemovingAdmin method 
Added isRemovingAdmin method, so that clients can query if device
admin is currently being removed.

Bug: 17609838
Change-Id: I82547a9eeb228fcf8ac2a6e639ca1a75fa41d161
 2014-12-04 17:53:45 -08:00
Svetoslav
ed068f7c30 am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit '3a0d878ab56475276c61d574af7651820a5cea5a':
  Ensure all events from a showing window are dispatched.
 2014-12-05 00:45:51 +00:00
Svetoslav
3a0d878ab5 Ensure all events from a showing window are dispatched. 
Accessibility services may opt-in to introspect the interactive
windows on the screen. If window introspection is enabled there
is a case where some events from a showing window are received
before the updated window state from the window manager. Now the
window manager sends over the windows before notifying the app
for the focus change.

bug:18625996

Change-Id: Ic481e01efbe12dc92f090f799feeb236672fc7b3
 2014-12-05 00:37:38 +00:00
Chet Haase
b29c629970 am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit '0a77897bb6671220fe9d53964ccd2651216dc7ba':
  Fix seeking behavior
 2014-12-04 23:35:37 +00:00