drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,739 Commits 1 Branch 0 Tags
Commit Graph

170739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wale Ogunwale
ec533f6a55 Don't destroy surfaces of activities launched behind early. 
When the launch activity behind feature was introduced in
http://ag/502868, we destroy the surfaces of windows associated with
the activity early in the last app window animation step. The causes
issues with activities that might be using the surface and not
prepared to have the surface destroyed from underneath them. We now
let the surface destruction get handled like any other window so all
the components/processes interested in the surface can be in the
right state when the surface is destroyed.

Bug: 18325222
Change-Id: I45e834a07a199b8a9e364f7392db99c871a43280
 2014-12-05 14:52:04 -08:00
Quddus Chong
f7b5197749 am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit '87644a43bd3e54e39b330e627148ce6e7245d9b4':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 22:47:23 +00:00
Quddus Chong
15c3ce77fd am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '0dfcfdcbea3fcfa0679e2ee2a196de17c804479e':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 22:47:17 +00:00
Quddus Chong
87644a43bd am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit '2b32a042b59fe12393cdb70bc59f0ce8e9a90c91':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 22:36:54 +00:00
Quddus Chong
0dfcfdcbea am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '230569292c5dfb0e55682c4ecc3b26f0581a8195':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 22:36:49 +00:00
Quddus Chong
2b32a042b5 Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 2014-12-05 22:30:48 +00:00
Quddus Chong
230569292c Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 2014-12-05 22:30:26 +00:00
ztenghui
550348220e am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '62517a6e9ce85b23da67767a9e75e252d7989502':
  Fine tune the light radius from 800dp to 600dp
 2014-12-05 22:12:50 +00:00
ztenghui
62517a6e9c Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 2014-12-05 21:56:02 +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
Alan Viverette
23d86231e9 am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
  Update locally cached drawables when constant state changes
 2014-12-05 21:41:10 +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
Craig Mautner
c67d89588c am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev 
* commit '3f11bba5b90b9b0098f23f08a97e3dfc1421db33':
  bug fix possible NPE while startProcessLocked()
 2014-12-05 21:40:55 +00:00
Craig Mautner
637e4cb4b3 am b97b19f6: am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev 
* commit 'b97b19f6a46fe3388373f2215446363e64e799c1':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-05 21:40:49 +00:00
Craig Mautner
a6e99486b1 am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev 
* commit 'f6d03f398098bdff74bcc7442fbc1912536a33e2':
  [ActivityManager] Fix race condition in pss collection
 2014-12-05 21:40:43 +00:00
Craig Mautner
f128225f93 am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 
* commit 'a32933fdfe5909de63b938b65ec0d74297d0800d':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-12-05 21:40:37 +00:00
Craig Mautner
7978f60b9e am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 
* commit '95cce9d57e627a86f612bf402b3338a6a1a1eae3':
  Avoid system server crash due to package removed
 2014-12-05 21:40:32 +00:00
Craig Mautner
655dd3eb17 am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit '435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-05 21:40:26 +00:00
Craig Mautner
004540260c am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
  [ActivityManager] Fix NPE when start activity
 2014-12-05 21:40:21 +00:00
Filip Gruszczynski
ff778fe450 Fix calculation of overscan insets in WindowState. 
Bug: 18630625
Change-Id: I19b0c8627c3b9d61923e68c59fce9bddb2751c3d
 2014-12-05 13:31:43 -08:00
Sanket Padawe
49aeee2e79 am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '0c1a5bea2eb897b3f1d34b9c25ea6ed0bd5ca6eb':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-05 20:59:02 +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
Sanket Padawe
0c1a5bea2e Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 2014-12-05 20:55:52 +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
Stuart Scott
eb29c7332c am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit 'd2028d90fa99196dd1fc70825f94cd0a5da83854':
  Add mapping between RAT and Network Mode
 2014-12-05 20:47:56 +00:00
Jing Zhao
23ad6efbf8 am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit 'df1d07b4c77bcc8928b2e5360440aa9b69a6cd21':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-05 20:47:42 +00:00
Stuart Scott
d2028d90fa Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 2014-12-05 20:44:26 +00:00
Jing Zhao
df1d07b4c7 Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
Adding new system permission android.permission.CARRIER_FILTER_SMS

Bug: 18609762
Change-Id: I80a133653101cd4ec1793e726faf3601e2970224
 2014-12-05 20:42:33 +00:00
RoboErik
7c82ced4fc Route mute key events through MediaSessionService 
This sends mute keys to the MediaSessionService and handles them
by toggling the appropriate stream. Muting remote playback is still
not supported.

bug:17501993
Change-Id: I18c5b037cde2175acbb64b118dd708514acfd8c9
 2014-12-05 12:41:34 -08:00
Chris Wren
ea9abd14dc am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit '0c5ec0e0db3ac8d3d1ed6796ab2bcc9cc37cf5fa':
  Avoid race condition in heads up snooze code path.
 2014-12-05 20:29:10 +00:00
Stuart Scott
997ddc8e3e Add mapping between RAT and Network Mode 
bug:18416275
bug:18415493

Change-Id: I0b29ec953ec9eb29248a22d582013127ee0fea41
 2014-12-05 20:28:14 +00:00
Chris Wren
0c5ec0e0db Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 2014-12-05 20:22:11 +00:00
David Friedman
278fd97a00 am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
  Change notes for NDK r10d, to publish to DAC
 2014-12-05 20:19:43 +00:00
Geoff Mendal
cf6821a942 am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
  Import translations. DO NOT MERGE
 2014-12-05 20:19:37 +00:00
David Friedman
b69f1f0b6c am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '29b040019226d7d02a57fe76a471465d16109f0b':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-05 20:19:30 +00:00
Svetoslav
323c02d4e0 am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 
* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
  Notify accessibility for window changes after an app animation end.
 2014-12-05 20:19:24 +00:00
Justin Harrison
ff4f24866c am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '2b236ab30e479d22c0619670a97c90993307a190':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 20:19:10 +00:00
Craig Mautner
e1d4b9fab1 am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 
* commit '8432cee04f2ec4bf77a3ba84524148b78db7ea57':
  Prevent ANR when broadcast receiver is killed
 2014-12-05 20:18:58 +00:00
Paul Jensen
704c8c0c3b am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2014-12-05 20:18:45 +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
Christopher Tate
41b0cbb3a6 am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit '2aa909f0ab017e17d8397f18b8c2c6dc0ec150a4':
  Correctly parse previous PMBA state during backup
 2014-12-05 20:11:31 +00:00
Christopher Tate
a42d95f1bc am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit '8ec2dc00e5225256976ee6f07a715932f65c8833':
  Tune delivery and batching of alarms
 2014-12-05 20:11:26 +00:00
Christopher Tate
2aa909f0ab Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 2014-12-05 20:05:10 +00:00
Christopher Tate
8ec2dc00e5 Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 2014-12-05 20:04:25 +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
Ihab Awad
9ae44f927d am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev 
* commit '710e20d22516a896c3560d96fdec423ffa0d154e':
  Relax access on deprecated fields for compatibility.
 2014-12-05 19:44:43 +00:00