Commit graph

475 commits

Author SHA1 Message Date
Iliyan Malchev
0e08ecf0ce am eab87cf3: Merge "deb: update camera kernel headers" into jb-mr2-dev
* commit 'eab87cf364514150180e28c0cf3e7de5e875a319':
  deb: update camera kernel headers
2013-06-24 15:27:52 -07:00
Ed Tam
163e24547c Enable SMS receiver on deb
Bug: 9526669
Change-Id: I2f2cd73f7fa11afeee3ef649e7b45e9133a59a9e
2013-06-24 15:06:47 -07:00
The Android Automerger
195e19059f merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-24 14:54:57 -07:00
The Android Automerger
5c212a031f Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:41:08 -07:00
Iliyan Malchev
eab87cf364 Merge "deb: update camera kernel headers" into jb-mr2-dev 2013-06-24 21:15:54 +00:00
Jean-Baptiste Queru
648de37023 am d2f66047: Self-extractors for JSR82
* commit 'd2f66047398f5ab629f81e20511786a117be8104':
  Self-extractors for JSR82
2013-06-21 12:59:43 -07:00
Jean-Baptiste Queru
d2f6604739 Self-extractors for JSR82
Change-Id: I796fd323a6884f062ecc5acdbb769d79c9f745bc
2013-06-21 12:45:09 -07:00
The Android Open Source Project
e6f236f2d2 am 964bc596: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '964bc5960c8089cdefa83940c4feb4018019fe4a':
2013-06-21 11:58:19 -07:00
The Android Open Source Project
964bc5960c Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I85480f5bdb25a943ad5ee2e01aab6c7f3f21355b
2013-06-21 11:56:44 -07:00
The Android Automerger
f342f1c5bb merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-21 11:34:46 -07:00
chiayi_wu
1375200ec7 deb: update camera kernel headers
Make YUV_MWB consistent with Bayer_MWB.

Bug: 9492735

Change-Id: I6c8d8279a2dd05b19bb7cc567533e02fb58bc833
Signed-off-by: chiayi_wu <chiayi_wu@asus.com>
2013-06-21 10:56:09 -07:00
Wink Saville
b724471c46 am a3bb2b25: am 206533eb: Fix and simplify mcc config.xml specific values.
* commit 'a3bb2b259b11442fffd5e95f56e3d6a99ef95dc6':
  Fix and simplify mcc config.xml specific values.
2013-06-21 08:50:40 -07:00
Wink Saville
a3bb2b259b am 206533eb: Fix and simplify mcc config.xml specific values.
* commit '206533eb63080607fd5113902a7302b8e13283c2':
  Fix and simplify mcc config.xml specific values.
2013-06-21 08:48:48 -07:00
Wink Saville
206533eb63 Fix and simplify mcc config.xml specific values.
I'd placed the config.xml files inside the values directory.
They should have been up a level in the res directory. Also,
since we currently want all US operators we need to just create
two directories for mcc 310 and 311.

Bug: 9513380
Change-Id: Id08848354b286b0ef7fab576a7de0376d1e7b888
2013-06-20 18:23:46 -07:00
Iliyan Malchev
740769770e am 346e30f1: am 7abccb5e: deb: update camera kernel headers
* commit '346e30f1293665f8ec76e8e042bff2aaf8a67580':
  deb: update camera kernel headers
2013-06-19 18:58:17 -07:00
Iliyan Malchev
346e30f129 am 7abccb5e: deb: update camera kernel headers
* commit '7abccb5ea65f9e886e8d98a3c9114ae019772682':
  deb: update camera kernel headers
2013-06-19 18:57:04 -07:00
Iliyan Malchev
7abccb5ea6 deb: update camera kernel headers
Bug: 9316451
Change-Id: Iafbea5c3f0b39f9613cc13611670a0daa6554a5e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-06-19 15:49:31 -07:00
Wink Saville
a05b16bbad am 8c68ea85: am 38c8dcd0: Merge "Add config_show4GForLte false to US carrier config.xml" into jb-mr2-dev
* commit '8c68ea853ed3fcae8a412f21bb3c42b730afebbe':
  Add config_show4GForLte false to US carrier config.xml
2013-06-19 10:17:04 -07:00
Wink Saville
8c68ea853e am 38c8dcd0: Merge "Add config_show4GForLte false to US carrier config.xml" into jb-mr2-dev
* commit '38c8dcd0a4c3990b64b5a6ea32c3c7dbb48d9217':
  Add config_show4GForLte false to US carrier config.xml
2013-06-19 10:14:26 -07:00
Wink Saville
38c8dcd0a4 Merge "Add config_show4GForLte false to US carrier config.xml" into jb-mr2-dev 2013-06-19 17:09:34 +00:00
Wink Saville
10afb90306 Add config_show4GForLte false to US carrier config.xml
By default we now show 4G instead of LTE by changing
config_show4GForLte to true in
  frameworks/base/packages/SystemUI/res/values/config.xml

So for US carriers we are adding a config.xml which has
config_show4GForLte to false. The list of overlays comes from
looking for mcc=310 & mcc=311 in the apns-conf.xml for vendor deb.

Bug: 9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
2013-06-19 17:04:04 +00:00
Iliyan Malchev
a2d2457ec1 am 6e934755: am 94528452: Merge "deb: Start ppd when surfaceflinger is running" into jb-mr2-dev
* commit '6e9347552694f2c3231e9a3765f1c3caba740876':
  deb: Start ppd when surfaceflinger is running
2013-06-18 17:37:22 -07:00
Iliyan Malchev
6e93475526 am 94528452: Merge "deb: Start ppd when surfaceflinger is running" into jb-mr2-dev
* commit '945284527693efff4a43ed1439f54d1310ad24a6':
  deb: Start ppd when surfaceflinger is running
2013-06-18 17:32:09 -07:00
Iliyan Malchev
9452845276 Merge "deb: Start ppd when surfaceflinger is running" into jb-mr2-dev 2013-06-19 00:24:58 +00:00
Jean-Baptiste Queru
6d77e0a876 am e4f88f44: Self-extractors for JSR78B
* commit 'e4f88f448ba5c1504b4cc7a0ffd670fdee467024':
  Self-extractors for JSR78B
2013-06-18 12:57:53 -07:00
Jean-Baptiste Queru
e4f88f448b Self-extractors for JSR78B
Change-Id: I5d902602a39538d3ceac47f7cf26165ab2e452df
2013-06-18 12:54:32 -07:00
Jean-Baptiste Queru
b994e1de07 am 40fe70b3: Self-extractors for JSR78
* commit '40fe70b311012b16d38232297232118829a43f16':
  Self-extractors for JSR78
2013-06-17 10:55:59 -07:00
Jean-Baptiste Queru
40fe70b311 Self-extractors for JSR78
Change-Id: I1eac961053c7901c709bc9a8233c85c47bad1f63
2013-06-17 07:50:09 -07:00
The Android Open Source Project
6dbfb1a42f am e2ea2d28: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'e2ea2d281a38f4021e58745e6e2bb591fdc7955d':
2013-06-16 07:45:36 -07:00
The Android Open Source Project
e2ea2d281a Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifa59e8763d2dcf0dde8ce1eac004d9b1bd9f0806
2013-06-16 07:43:46 -07:00
The Android Automerger
802b70f705 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-16 05:55:02 -07:00
Jean-Baptiste Queru
2e8b3d9e9b am 6b6c92ea: am 8e301f56: auto-generated blob list
* commit '6b6c92ea2d5a83875bac7316217dbbbb1bd88370':
  auto-generated blob list
2013-06-14 16:09:28 -07:00
Jean-Baptiste Queru
44ad94c0c9 am ef8e26e5: Update for latest file list
* commit 'ef8e26e579ccf2e1e7b28eea22eccb4127620b48':
  Update for latest file list
2013-06-14 16:09:28 -07:00
Jean-Baptiste Queru
6b6c92ea2d am 8e301f56: auto-generated blob list
* commit '8e301f56621d0a1f60d7c49dda5243a97fdd31db':
  auto-generated blob list
2013-06-14 16:07:00 -07:00
Jean-Baptiste Queru
ef8e26e579 Update for latest file list
Bug: 4295425
Change-Id: Id06ead3b435b00b57317111dbab09e40df650499
2013-06-14 16:04:22 -07:00
Jean-Baptiste Queru
8e301f5662 auto-generated blob list
Bug: 4295425
Change-Id: Ib0d516a22f3b2c098a284d9ad9b1937c71feda41
2013-06-14 04:09:18 -07:00
Naseer Ahmed
2d30abc671 deb: Start ppd when surfaceflinger is running
Bug: 9418053
Change-Id: I384f47d5b148e7ecd8a86ceb0354f2d4803ddc1c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-06-13 17:38:41 -07:00
Jean-Baptiste Queru
e71bf0c670 auto-generated blob list for deb
Bug: 4295425
Change-Id: Icc6e671ce61819d680e6a366243a16277a451782
2013-06-13 15:48:44 -07:00
Ed Tam
d4b02316c6 am c53e6415: am 94928491: Remove telephony features (for phones) from deb.
* commit 'c53e6415cb92a01262b1e6d46cee0e42ab7afa76':
  Remove telephony features (for phones) from deb.
2013-06-13 10:43:44 -07:00
Ed Tam
c53e6415cb am 94928491: Remove telephony features (for phones) from deb.
* commit '94928491431e757a2c96d9530f2d63f425cf4d40':
  Remove telephony features (for phones) from deb.
2013-06-13 10:05:34 -07:00
The Android Open Source Project
1e80896ae1 am 4bbf5878: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '4bbf5878f1ca47779a2d5cee6782bcbe3d1956fd':
2013-06-13 08:25:38 -07:00
The Android Open Source Project
4bbf5878f1 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ie9d02e1796d6fb3057a793b2b60f64c88458c972
2013-06-13 08:22:33 -07:00
The Android Automerger
76ee1a27f7 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:03 -07:00
The Android Open Source Project
cee96b684f am e7cca24b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e7cca24b30d02a92976cae0c78e8fa4fc831172c':
  Add config_dontPreferApn configuration.
2013-06-12 18:06:10 -07:00
The Android Open Source Project
e7cca24b30 Reconcile with jb-mr2-release - do not merge
Change-Id: Icdf983ce42bab6affd7179bbb959a197cde610b9
2013-06-12 18:04:03 -07:00
Ed Tam
9492849143 Remove telephony features (for phones) from deb.
Bug: 9277812
Change-Id: I72ca2c630e27b4c086bdd3435f4764759a184432
2013-06-12 16:57:23 -07:00
Wink Saville
fd254598df Add config_dontPreferApn configuration.
For AT&T we must not use the preferred network to get around
bug 7305641. These files come from device/asus/tilapia.

Bug: 9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
2013-06-12 14:26:48 -07:00
Wink Saville
289ace4976 am 8f00bc1d: am 1c27de8d: Merge "Add config_dontPreferApn configuration." into jb-mr2-dev
* commit '8f00bc1d6b8d380988685ef72c0201d03333d5a4':
  Add config_dontPreferApn configuration.
2013-06-12 08:38:08 -07:00
Wink Saville
8f00bc1d6b am 1c27de8d: Merge "Add config_dontPreferApn configuration." into jb-mr2-dev
* commit '1c27de8d94c373ae0527ce99963f2efaca77aa55':
  Add config_dontPreferApn configuration.
2013-06-12 08:36:38 -07:00
Wink Saville
1c27de8d94 Merge "Add config_dontPreferApn configuration." into jb-mr2-dev 2013-06-12 15:34:48 +00:00