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

106356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Craig Mautner
c3797f40c1 am 4754f401: Merge "Avoid NullPointerException in getHandler()" 
* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
  Avoid NullPointerException in getHandler()
 2013-05-10 13:34:23 -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
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 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
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
Scott Main
eb46064c6f 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 '77d7e0a36234b8981c25232d6c35b4fd64d1c083':
  update homepage with IO Live banner
 2013-05-09 23:40:41 -07:00
Jim Miller
8f1b2e0b7f am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev 
* commit '0055383554983842c5d7bab25a981c6eb804a38c':
  Attempt to fix NPE in keyguard
 2013-05-09 23:40:30 -07:00
Dianne Hackborn
e8c9b39ec9 am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 
* commit '83d6df27d40aed18a7dc42c9320f83656cc81ea0':
  Help on issue #8863955: Google Services keeping phone awake...
 2013-05-09 23:40:28 -07:00
Elliott Hughes
92393d8518 Merge "Update nomenclature." into jb-mr2-dev 2013-05-10 05:30:26 +00:00
Dianne Hackborn
f6438b16ba Eradicate basically all of the system reboot stuff in the watchdog. 
This was implemented for 1.0 out of paranoia about the possibility
of needing to schedule reboots of the system after it went out in
the field, which I am happy to say was never ever used.

Let's get rid of it.

A small stub is left, to still service the API that allows people
to send a reboot broadcast to have the system immediately reboot.

Change-Id: I6731b24a28340e50c8015f8cb28e48f74f69f9b7
 2013-05-09 18:53:48 -07:00
Amith Yamasani
e8e93a143e Fix build error due to incorrect merge 
Keyguard package was moved, so a new file didn't get to the right directory.

Change-Id: I2cdf2d9ef785ca7852c38278f51b5af9f96320f7
 2013-05-09 18:12:30 -07:00
Dirk Dougherty
cf30f631cf am 3f14b556: am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit '3f14b556a30f4ae8026f05dadfa54c4d68ff926b':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 18:04:05 -07:00
Scott Main
77d7e0a362 am 3676cbb6: am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '3676cbb61a4c59957c2a8cb3a257ff2ce0a02597':
  update homepage with IO Live banner
 2013-05-09 18:04:00 -07:00
Dirk Dougherty
3f14b556a3 am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'cf90471aff7b43a8c0ebc32298b20d31d4e767a3':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 18:02:19 -07:00
Scott Main
3676cbb61a am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '054215d1a9d5e0f814388c235124f776fd3f42b6':
  update homepage with IO Live banner
 2013-05-09 18:02:16 -07:00
Dirk Dougherty
cf90471aff am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'f1456deaa85a999d2c10bc92642613c97782fd98':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:59:50 -07:00
Scott Main
054215d1a9 am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit 'd948cb496fb8e0941046457cd3321a0fbcadcbff':
  update homepage with IO Live banner
 2013-05-09 17:59:47 -07:00
Dirk Dougherty
f1456deaa8 am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'a48a2d16ef042466048eaff25542ea903711bff0':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:56:27 -07:00
Scott Main
d948cb496f am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '8f8202095e8f4cd167b499ca19ebccda63f04c0c':
  update homepage with IO Live banner
 2013-05-09 17:56:24 -07:00
Dirk Dougherty
a48a2d16ef am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit '4da9c11b2758d55c67f7a24c3eb519c36497ba5d':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:53:37 -07:00
Scott Main
8f8202095e am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '4e3773d3f626595c703d26dea1f354c37ad76bde':
  update homepage with IO Live banner
 2013-05-09 17:53:34 -07:00
Dirk Dougherty
4da9c11b27 Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 2013-05-10 00:37:51 +00:00
Dirk Dougherty
4af1bf8d20 Doc change: refresh gms/gcm reference docs. 
Change-Id: Ife17b6b3dfb387bc7de6c827c0e6db19a756534f
 2013-05-09 17:30:29 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
 2013-05-09 17:09:24 -07:00
Jeff Brown
1f59cbb20a am 507a3c77: am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '507a3c77d583643f4a884c5d7b0c5e6bce3222bb':
  Fix bug managing wifi display routes.
 2013-05-09 17:09:22 -07:00