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

160925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
386effc7a1 am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit 'f779e6b8ac827d923e3e7905045ad5c35512c535':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-06 02:10:49 +00:00
Jeff Davidson
401ef259f3 am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 
* commit 'a4144563a5bd0e0be4a97fa6e89be6fb455da372':
  add disable Ephemeral Network API Bug:18525241
 2014-12-06 02:10:39 +00: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
Jeff Davidson
f779e6b8ac Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 2014-12-06 02:06:50 +00:00
Jeff Davidson
a4144563a5 Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 2014-12-06 02:06:12 +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
Evan Charlton
068a078645 am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 
* commit '59dac0e192a920682d42e2da395fb3fa62f4fdc4':
  Associate a UserHandle with each PhoneAccountHandle
 2014-12-06 01:52:56 +00:00
Evan Charlton
59dac0e192 Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 2014-12-06 01:45:12 +00:00
Paul Jensen
a4afe13af3 am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit '891dd5743af17e3376b0b0438b149c565cf871c8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-06 01:31:32 +00:00
Paul Jensen
891dd5743a Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 2014-12-06 01:23:56 +00:00
Jeff Davidson
f9fff92d70 Fix flipped captive portal bit in network conditions bcast. 
Bug: 18651036
Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a
 2014-12-05 16:56:08 -08:00
Jeff Tinker
b15a57d64d am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit '82cc1c5a2d279bce4d4ce83a68613633f9ff8be2':
  Unhide secure stop APIs
 2014-12-06 00:34:05 +00:00
Jeff Tinker
82cc1c5a2d Merge "Unhide secure stop APIs" into lmp-mr1-dev 2014-12-06 00:28:26 +00:00
Jinsong Mu
6fac0351ce am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit 'b3898fbe07b488ba15d696be9d00ccfac66a6a77':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-05 23:54:00 +00:00
Ihab Awad
2b45554454 am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '6a1c82564f6b5e48928f9ff8023c8aed41d78a3a':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-05 23:53:54 +00:00
Jinsong Mu
b3898fbe07 Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 2014-12-05 23:50:02 +00:00
Ihab Awad
6a1c82564f Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 2014-12-05 23:46:19 +00:00
Jeff Tinker
846e712dc7 Unhide secure stop APIs 
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
 2014-12-05 15:44:17 -08:00
David Friedman
7823e6ee90 am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '968ef51c679105df4770a2d04b506a7f5ffacaf8':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:34:20 +00:00
David Friedman
968ef51c67 am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit 'c305e6eb4aacf08001241ce18e0a86ba369fd421':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:27:27 +00:00
Ihab Awad
0855e7aea2 Add Text-to-Speech annotations for phone number displays (1/3) 
Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
 2014-12-05 15:27:08 -08:00
RoboErik
2d7a1b09e9 am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit 'd386d0f391c41e3e6e87abab44600df24f45ac4a':
  Route mute key events through MediaSessionService
 2014-12-05 23:23:59 +00:00
David Friedman
c305e6eb4a am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '860bdc7d5e4f5a6e065e5c66c1e25fcca7fe5f27':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:20:00 +00:00
RoboErik
d386d0f391 Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 2014-12-05 23:16:41 +00:00
David Friedman
860bdc7d5e am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit 'b357f74e5163d5e4e322302055d053e99e29f60f':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:12:12 +00:00
David Friedman
b357f74e51 Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 2014-12-05 23:04:58 +00:00
Quddus Chong
e6000f4753 am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit '52fec4707ddfd7e2b2e8f7459635d4d48fe9b30a':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 23:01:33 +00:00
Quddus Chong
f428952e09 am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '9deffeccfe06587a09a0ca42cab1c53ff46d887f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 23:01:16 +00:00
Wale Ogunwale
80d119121f am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit 'b503e3f2872636b450d950b5792fdb569d87819c':
  Don't destroy surfaces of activities launched behind early.
 2014-12-05 23:01:11 +00:00
Filip Gruszczynski
91a5dd9b43 am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit 'e6a2ff2b1f7a2241350347fd0f12ffccc1391649':
  Fix calculation of overscan insets in WindowState.
 2014-12-05 23:01:06 +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
Quddus Chong
52fec4707d am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit 'f7b51977490f0951dead8e81bc09dae2d546ac65':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 22:58:30 +00:00
Quddus Chong
9deffeccfe am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '15c3ce77fd8eccef01f1c0671485fcc20c4c6e9c':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 22:58:24 +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
vandwalle
93e4192c06 add disable Ephemeral Network API 
Bug:18525241

Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
 2014-12-05 14:56:43 -08:00
Wale Ogunwale
b503e3f287 Merge "Don't destroy surfaces of activities launched behind early." into lmp-mr1-dev 2014-12-05 22:56:13 +00:00
Filip Gruszczynski
e6a2ff2b1f Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 2014-12-05 22:56:00 +00: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
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
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