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

106582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
1a41a44e2f am ae925f62: am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev 
* commit 'ae925f62b9bb582384408c269427215e4cbeb531':
  Fix battery level quick settings tile bug.
 2013-05-10 16:16:34 -07:00
Robert Greenwalt
1483631c2f am a62fbd31: am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." 
* commit 'a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee':
  frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
 2013-05-10 16:16:30 -07:00
Conley Owens
9926960d13 am e6abfd96: am d702e48c: Merge "Expose AutoCloseable." 
* commit 'e6abfd96564b464a3ac583ac0644d3680b8a9cdf':
  Expose AutoCloseable.
 2013-05-10 16:16:27 -07:00
Christopher Tate
cc1cd712a8 am ecb4dbf6: am 1965b447: Revert "The default home intent needs CATEGORY_DEFAULT" 
* commit 'ecb4dbf6fc41e3e31fd5713e7e968e8a767a4933':
  Revert "The default home intent needs CATEGORY_DEFAULT"
 2013-05-10 16:16:22 -07:00
Jeff Brown
f8e5484614 am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit '9766caedf0657615f739d4e441ab9f2fa71aa709':
  Add an API to determine if a route is connecting.
 2013-05-10 16:13:44 -07:00
Jeff Brown
9766caedf0 Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 2013-05-10 23:10:33 +00:00
Robert Greenwalt
dfbf21e591 am 6f8fb959: Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 
* commit '6f8fb9594fa5387340601c8b6e3e13f51e57f54b':
  Enable Opportunistic Key Caching on WPA2-Enterprise Networks
 2013-05-10 15:57:06 -07:00
Dmitry Shmidt
509b51aa25 am 00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events" 
* commit '00ee47ead451ee2584c23f15a3760ae041e82e56':
  framework/base: Handle ASSOC-REJECT events
 2013-05-10 15:57:02 -07:00
Robert Greenwalt
6f8fb9594f Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 2013-05-10 22:41:10 +00:00
John Spurlock
ae925f62b9 am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev 
* commit '11184922d30f468bf97a2e20a3aeff7e1ae7ca54':
  Fix battery level quick settings tile bug.
 2013-05-10 15:39:04 -07:00
John Spurlock
11184922d3 Merge "Fix battery level quick settings tile bug." into jb-mr2-dev 2013-05-10 22:36:18 +00:00
Dmitry Shmidt
00ee47ead4 Merge "framework/base: Handle ASSOC-REJECT events" 2013-05-10 22:35:23 +00:00
Robert Greenwalt
a62fbd31b3 am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." 
* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
  frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
 2013-05-10 15:26:30 -07:00
Conley Owens
e6abfd9656 am d702e48c: Merge "Expose AutoCloseable." 
* commit 'd702e48c1394e4e0fc4db8ffc83e4b9ef6e6a40d':
  Expose AutoCloseable.
 2013-05-10 15:26:26 -07:00
Craig Mautner
e555d16421 am c3797f40: am 4754f401: Merge "Avoid NullPointerException in getHandler()" 
* commit 'c3797f40c1a8a8f7ca72816642110221933ff8fd':
  Avoid NullPointerException in getHandler()
 2013-05-10 15:17:00 -07:00
Svetoslav
6f3a6a453a am 1e4c6589: am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 
* commit '1e4c6589941e459871eed6e9d4675b05d977325c':
  Accessibility should not query for list items when data set changed.
 2013-05-10 15:16:57 -07:00
Robert Greenwalt
408ad99dd3 Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." 2013-05-10 22:15:27 +00:00
Conley Owens
d702e48c13 Merge "Expose AutoCloseable." 2013-05-10 22:11:46 +00:00
Christopher Tate
ecb4dbf6fc am 1965b447: Revert "The default home intent needs CATEGORY_DEFAULT" 
* commit '1965b4479d07750756ccf845134df6ddd5ce4103':
  Revert "The default home intent needs CATEGORY_DEFAULT"
 2013-05-10 15:08:27 -07:00
Christopher Tate
1965b4479d Revert "The default home intent needs CATEGORY_DEFAULT" 
This reverts commit 1fea6b374f612ca8cedc17de873526f0f7c42a4e.

Bug 8895796

Change-Id: I80ecf1b718829c25e2a7adae956ebe9493cb3f33
 2013-05-10 15:01:02 -07:00
Elliott Hughes
10b802889b Expose AutoCloseable. 
Bug: 3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
 2013-05-10 14:21:30 -07:00
Craig Mautner
c3797f40c1 am 4754f401: Merge "Avoid NullPointerException in getHandler()" 
* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
  Avoid NullPointerException in getHandler()
 2013-05-10 13:34:23 -07:00
Craig Mautner
c36c8e6f1f Fix issue #8868003: Recents thumbnails scale... 
...+ zoom to wrong place

We need to make sure the overscan insets are never negative.

master version of ag/307569.

Change-Id: I4beed63a9541e228087b588e32996669755fcc51
 2013-05-10 13:33:31 -07:00
Svetoslav
1e4c658994 am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 
* commit 'b3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80':
  Accessibility should not query for list items when data set changed.
 2013-05-10 13:10:41 -07:00
Svetoslav
b3c2b21b5b Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 2013-05-10 20:06:42 +00:00
John Spurlock
d3fc956a11 Fix battery level quick settings tile bug. 
Bug: 8726138
Change-Id: I068a78f99ab30ffe24e620be7744cf7835142f56
 2013-05-10 15:58:55 -04:00
Craig Mautner
4754f401a9 Merge "Avoid NullPointerException in getHandler()" 2013-05-10 19:50:39 +00:00
Chris Craik
e8f9a37395 am f420a36e: am 4329ee25: Merge "Fix off by one error in log tracking" into jb-mr2-dev 
* commit 'f420a36e5f62a9ab38f6782db78f5d94947b034e':
  Fix off by one error in log tracking
 2013-05-10 12:46:45 -07:00
Marco Nelissen
2b8ae6f521 am 68c666eb: am 804e618d: Fix build 
* commit '68c666ebb75b7e87ee9773752165351482b49a08':
  Fix build
 2013-05-10 12:46:42 -07:00
Marco Nelissen
bed4301eed am 214c7474: am aad3762f: Merge "Fix build" into jb-mr2-dev 
* commit '214c74747d0ff8219e020c5edc6f12bca923b45a':
  Fix build
 2013-05-10 12:46:39 -07:00
Marco Nelissen
c08d4d99e2 am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd':
  Add VideoView.getAudioSessionId()
 2013-05-10 12:46:36 -07:00
Chris Craik
f420a36e5f am 4329ee25: Merge "Fix off by one error in log tracking" into jb-mr2-dev 
* commit '4329ee25659c27b1cd90f95f127192964346e471':
  Fix off by one error in log tracking
 2013-05-10 12:44:26 -07:00
Marco Nelissen
68c666ebb7 am 804e618d: Fix build 
* commit '804e618db6240a6c253c0d3eab2232b1823e217a':
  Fix build
 2013-05-10 12:44:12 -07:00
Marco Nelissen
214c74747d am aad3762f: Merge "Fix build" into jb-mr2-dev 
* commit 'aad3762f1bcc3e90c6f312669caa1115f4714669':
  Fix build
 2013-05-10 12:44:09 -07:00
Marco Nelissen
1d3488cba9 am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 
* commit '86e0b491d1b50e59221420de3005184b1dee8373':
  Add VideoView.getAudioSessionId()
 2013-05-10 12:44:05 -07:00
Chris Wren
3da7302dd2 restart notification listener on package add 
Bug: 8813471
Change-Id: Icf6c69811392c4567a5c842740e463fb957e7563
 2013-05-10 14:49:53 -04:00
Chris Craik
4329ee2565 Merge "Fix off by one error in log tracking" into jb-mr2-dev 2013-05-10 18:03:57 +00:00
Dianne Hackborn
0bab11cfff Merge "Eradicate basically all of the system reboot stuff in the watchdog." 2013-05-10 17:49:00 +00:00
Marco Nelissen
804e618db6 Fix build 
Change-Id: I2eb54a936630094b4bd9c19a944579670a4e0bb8
 2013-05-10 08:28:36 -07:00
Marco Nelissen
aad3762f1b Merge "Fix build" into jb-mr2-dev 2013-05-10 15:16:27 +00:00
Marco Nelissen
ff9a243797 Fix build 
Change-Id: I4afe65f73d8607a97a561615ebfc34aadfe00b95
 2013-05-10 08:05:15 -07:00
Partha N
ee011077df Enable Opportunistic Key Caching on WPA2-Enterprise Networks 
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Replaced TABs with spaces.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
 2013-05-10 07:53:26 -07:00
Marco Nelissen
86e0b491d1 Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 2013-05-10 14:12:13 +00:00
Elliott Hughes
92477f079d am 16ea91db: am 92393d85: Merge "Update nomenclature." into jb-mr2-dev 
* commit '16ea91db8c000ad33c665dd4ae3a6dadd7aac62c':
  Update nomenclature.
 2013-05-10 03:06:46 -07:00
Dirk Dougherty
6407eee8da am eb41e858: am cf30f631: am 3f14b556: am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'eb41e8582c7e43126bf55ae9d8b7c722dbd4372d':
  Doc change: refresh gms/gcm reference docs.
 2013-05-10 03:06:43 -07:00
Scott Main
6d51757944 am eb46064c: am 77d7e0a3: am 3676cbb6: am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit 'eb46064c6f314da5fea7a688f53788a4969358ee':
  update homepage with IO Live banner
 2013-05-10 03:06:41 -07:00
Jim Miller
08763af07e am 8f1b2e0b: am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev 
* commit '8f1b2e0b7fdb1de3537fe3f45ba634fb74a94b4e':
  Attempt to fix NPE in keyguard
 2013-05-10 03:06:38 -07:00
Dianne Hackborn
fee8cd7582 am e8c9b39e: am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 
* commit 'e8c9b39ec976029d3571f8904a3db21d6514ecf6':
  Help on issue #8863955: Google Services keeping phone awake...
 2013-05-10 03:06:35 -07:00
Elliott Hughes
16ea91db8c am 92393d85: Merge "Update nomenclature." into jb-mr2-dev 
* commit '92393d8518604eab9a1edfbcf8f0329ffeee46e7':
  Update nomenclature.
 2013-05-09 23:40:54 -07:00
Dirk Dougherty
eb41e8582c am cf30f631: am 3f14b556: am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'cf30f631cf0aa9108b2d495ea43e102608cfa91e':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 23:40:44 -07:00