Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,016 Commits 3 Branches 0 Tags
eedf20c2eafde695a5ae50570a21d5449d6903ea
Commit Graph

48016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Conley Owens
eedf20c2ea Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Conley Owens
8279c193d1 am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 14:53:10 -07:00
Conley Owens
779fa1515d am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:48:45 -07:00
Conley Owens
ba5aebd106 am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage
 2011-04-27 13:41:12 -07:00
Conley Owens
4a4d96e7ee Merge changes I0ab47e2f,Ib8016996 
* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:06:46 -07:00
Conley Owens
ac505b86b4 am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
  Add lock before calling initEglImage
 2011-04-27 12:46:09 -07:00
Conley Owens
f0556bb90f am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage
 2011-04-27 12:43:19 -07:00
Conley Owens
86d1d74762 Merge "Add lock before calling initEglImage" 2011-04-27 12:28:05 -07:00
Gloria Wang
d84df05490 am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h 
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
  Add heartbeat error codes into MediaErrors.h
 2011-04-27 12:24:42 -07:00
Conley Owens
b54bebf47f am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted. 
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
  Fix for startup NPE.
 2011-04-27 12:21:50 -07:00
Conley Owens
470239a090 am 30d59fa9: Ignore fix for startup NPE as file is deleted. 
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
  Fix for startup NPE.
 2011-04-27 12:18:03 -07:00
Gloria Wang
969749319c am 83ddcdf7: Add heartbeat error codes into MediaErrors.h 
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
  Add heartbeat error codes into MediaErrors.h
 2011-04-27 12:11:49 -07:00
Conley Owens
30d59fa90f Ignore fix for startup NPE as file is deleted. 
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
 2011-04-27 12:09:35 -07:00
Conley Owens
44935c2908 Merge "Fix for startup NPE." 2011-04-27 11:40:46 -07:00
Gloria Wang
83ddcdf7fd Add heartbeat error codes into MediaErrors.h 
related-to-bug: 4322415

Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
 2011-04-26 19:35:32 -07:00
Nick Pelly
3fa53e448a am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:09:02 -07:00
Nick Pelly
36e6c4c194 am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:04:02 -07:00
Nick Pelly
cc9ee72bd4 Implement dead service recovery in NFC extras library. 
Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
 2011-04-26 16:38:00 -07:00
Conley Owens
ca15bf7ae0 am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '54a952c84317afc64034ded8baad3d788a54026d':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 16:01:13 -07:00
Conley Owens
54a952c843 am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:50:33 -07:00
Conley Owens
bf4769c7da am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:46:32 -07:00
Conley Owens
17ba30b549 Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 2011-04-26 14:36:48 -07:00
Kenny Root
fbb0e9f984 am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit 'bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:45:46 -07:00
Kenny Root
bb93dad925 am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:41:31 -07:00
Kenny Root
bb10986c3d am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:32:22 -07:00
Kenny Root
13ce221e43 Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
31418a1e9b am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 10:24:27 -07:00
Irfan Sheriff
4e1027e45d am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework 
* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
  Handle DHCP renewal and wakeup in framework
 2011-04-26 08:54:54 -07:00
Jean-Baptiste Queru
45e13ec1c5 am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 01:20:37 -07:00
Scott Main
1786fddabe am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 01:18:21 -07:00
Eric Laurent
48dca4de70 am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
  Fix issue 4335692: HDMI media volume
 2011-04-26 01:14:07 -07:00
Scott Main
e20c91de9c am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 01:12:14 -07:00
Irfan Sheriff
78d4e71dec am d2127c43: Handle DHCP renewal and wakeup in framework 
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
  Handle DHCP renewal and wakeup in framework
 2011-04-26 01:01:31 -07:00
Scott Main
e1e3d7d97c am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 00:45:35 -07:00
Jean-Baptiste Queru
5fcfce965f am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 00:39:44 -07:00
Robert Greenwalt
759efacd2d am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.
 2011-04-26 00:23:03 -07:00
Ramesh Sudini
9d5ac7bd8a am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out." 
* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
  Telephony: Fix merge issue "Set enabled state before notification is sent out."
 2011-04-26 00:21:37 -07:00
Eric Laurent
969357e31c am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume
 2011-04-26 00:19:34 -07:00
Robert Greenwalt
ef568c97b5 Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 2011-04-25 16:19:30 -07:00
Robert Greenwalt
af2eb4f6db Make new networkAttribute parameter non-optional. 
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
 2011-04-25 16:04:45 -07:00
Scott Main
97fee8554d docs: update a couple usb driver URLs 
bug: 4339758

Change-Id: I39357a0061312b189f50c296105cefe3862fc733
 2011-04-25 14:53:03 -07:00
Eric Laurent
223995dcf2 Fix issue 4335692: HDMI media volume 
Forced music stream volume to max when not muted and output device is HDMI.

Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
 2011-04-25 13:34:51 -07:00
Jean-Baptiste Queru
4b72eec34c Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 2011-04-25 13:33:37 -07:00
Ramesh Sudini
dcbba67afc Telephony: Fix merge issue "Set enabled state before notification is sent out." 
The original change-id was I6e84920b8d082fd6da838bccb5333051362bc4bc

Change-Id: I758641f8b29346a868e1b6b454ccd3f2341dffb8
 2011-04-25 11:30:32 -07:00
Joe Fernandez
7f90b316b6 am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013 
* commit '41f665a5f9d4e73ba8dabceb721c9c8873591bac':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013
 2011-04-22 16:48:44 -07:00
Freeman Ng
1e2e390fc7 am 3b9089c1: new LTE prepay related values 
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
  new LTE prepay related values
 2011-04-22 16:46:52 -07:00
Joe Fernandez
41f665a5f9 am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013 
* commit 'c84362a72ab958c4ffe34c16d8cf76883d48f0e8':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013
 2011-04-22 16:46:37 -07:00
Freeman Ng
3b9089c1fa new LTE prepay related values 
bug: 4082355
Change-Id: Id5a8f9b8bca64d9cf6ee13b00bd32c4911e9a3fa
 2011-04-22 16:42:57 -07:00
Joe Fernandez
c84362a72a am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013 
* commit 'a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013
 2011-04-22 16:36:33 -07:00
Joe Fernandez
a29e2cca5d docs: Fixing Issue with code for Adding Tabs topic 
bug 4293013

Change-Id: Ia08fe8ae0112af5157607e4fcd07773a945473f3
 2011-04-22 16:22:48 -07:00