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

5022 Commits

Author SHA1 Message Date
Mattias Petersson
1d766b5321 Add support for MNC=00 
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
 2013-07-26 18:42:34 +00:00
Elliott Hughes
9c8685b714 am f094eefc: am c5de9c35: Merge "Track libcore API update." 
* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.
 2013-07-11 18:55:54 -07:00
Elliott Hughes
f094eefc34 am c5de9c35: Merge "Track libcore API update." 
* commit 'c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
  Track libcore API update.
 2013-07-11 18:52:11 -07:00
Elliott Hughes
9444fcae54 Track libcore API update. 
Change-Id: I7ad4ee87008c2ba0f8f16d1c86d81b8114359e04
 2013-07-11 10:06:35 -07:00
Elliott Hughes
f445a68567 am 0b18c149: am 0f50cb31: Merge "Fix build." 
* commit '0b18c14931c4ca618c67b5ac5c8351246879e90a':
  Fix build.
 2013-07-09 17:53:32 -07:00
Elliott Hughes
0b18c14931 am 0f50cb31: Merge "Fix build." 
* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b':
  Fix build.
 2013-07-09 17:51:34 -07:00
Elliott Hughes
bfa5465ed2 Fix build. 
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
 2013-07-09 17:48:11 -07:00
Elliott Hughes
269d372276 am 86aa1953: am 2a26547f: Merge "Track libcore API update." 
* commit '86aa19532896dc6ede04d53ee96708becde9b0dc':
  Track libcore API update.
 2013-07-08 10:03:48 -07:00
Elliott Hughes
86aa195328 am 2a26547f: Merge "Track libcore API update." 
* commit '2a26547fd391c8038ad9f57fcb51d62fba0ee543':
  Track libcore API update.
 2013-07-08 10:01:17 -07:00
Elliott Hughes
2ecdbc5395 Track libcore API update. 
Bug: 3484927
Change-Id: Icd8a45d33efd205a5eb21ac6a4fcf781f8b5e064
 2013-07-08 09:41:06 -07:00
Elliott Hughes
9544df0767 am e88fe7f4: am 94fed1c5: Merge "Track libcore API update." 
* commit 'e88fe7f415334ae04a289f8bc697404212784df0':
  Track libcore API update.
 2013-07-01 16:48:00 -07:00
Elliott Hughes
e88fe7f415 am 94fed1c5: Merge "Track libcore API update." 
* commit '94fed1c5d570a92d357657451e5b47aba4feee12':
  Track libcore API update.
 2013-07-01 16:45:33 -07:00
Elliott Hughes
bf1589d0df Track libcore API update. 
Bug: 3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
 2013-07-01 16:39:34 -07:00
Elliott Hughes
aaf1612067 am 7c56325d: am c26e5505: Merge "Track libcore API update." 
* commit '7c56325d57c3c6022cfcb9b71343751c572bc656':
  Track libcore API update.
 2013-07-01 16:24:48 -07:00
Elliott Hughes
7c56325d57 am c26e5505: Merge "Track libcore API update." 
* commit 'c26e5505495f7a36163477e12098d5fd2822cae9':
  Track libcore API update.
 2013-07-01 16:22:16 -07:00
Elliott Hughes
812990a9e5 Track libcore API update. 
Bug: 3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
 2013-07-01 14:46:31 -07:00
Elliott Hughes
1a6fe26d1b am c63c0682: am e3b94f05: Merge "Track libcore API change." 
* commit 'c63c068228267b41fb106e22a6914ab19da9e5bc':
  Track libcore API change.
 2013-06-28 18:13:29 -07:00
Elliott Hughes
c63c068228 am e3b94f05: Merge "Track libcore API change." 
* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.
 2013-06-28 18:11:10 -07:00
Elliott Hughes
97c538d5f3 Track libcore API change. 
Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
 2013-06-28 18:03:46 -07:00
Elliott Hughes
d1411efee3 am 324993ab: am 5216f11e: Merge "Track libcore API update." 
* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.
 2013-06-28 16:26:08 -07:00
Elliott Hughes
324993abed am 5216f11e: Merge "Track libcore API update." 
* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.
 2013-06-28 16:23:47 -07:00
Elliott Hughes
0e88a95480 Track libcore API update. 
Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
 2013-06-28 16:08:02 -07:00
Elliott Hughes
5d2d22221a am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.
 2013-06-28 16:01:51 -07:00
Elliott Hughes
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -07:00
Elliott Hughes
6859af17ce Track libcore API update. 
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
 2013-06-28 15:28:00 -07:00
Elliott Hughes
34ba52a060 am a9510297: am 505974eb: Merge "Track libcore API update." 
* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.
 2013-06-28 13:09:58 -07:00
Elliott Hughes
a9510297a6 am 505974eb: Merge "Track libcore API update." 
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
 2013-06-28 13:07:21 -07:00
Elliott Hughes
5931afdc0f Track libcore API update. 
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
 2013-06-28 10:55:14 -07:00
Elliott Hughes
96fefaa23b am b87e6138: am 618ed234: Merge "Track nio API change." 
* commit 'b87e6138d169e5fd23b964056431e2c357323fd2':
  Track nio API change.
 2013-06-14 16:25:00 -07:00
Elliott Hughes
b87e6138d1 am 618ed234: Merge "Track nio API change." 
* commit '618ed2340283263164f578f818cc09148aacb9ed':
  Track nio API change.
 2013-06-14 16:22:12 -07:00
Elliott Hughes
28b7245cc1 Track nio API change. 
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
 2013-06-14 15:41:26 -07:00
Marco Nelissen
3826e8bd6e am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:10:26 -07:00
Scott Main
be173f6a16 am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev 
* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
  add ViewGroup's layoutMode attribute to public resources bug: 9359960
 2013-06-11 14:10:18 -07:00
Marco Nelissen
374904621a Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 2013-06-11 04:01:47 +00:00
Marco Nelissen
ecba2e4b95 Unhide MediaExtractor.getPsshInfo() 
b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
 2013-06-10 15:06:28 -07:00
Scott Main
dc74caa7e8 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-10 14:51:37 -07:00
Elliott Hughes
47aa51d029 am 70b74646: Merge "Track libcore changes." 
* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
  Track libcore changes.
 2013-06-06 13:53:54 -07:00
Elliott Hughes
598a16f71e Track libcore changes. 
Bug: 3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
 2013-06-06 13:40:21 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Daniel Sandler
491c607582 am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.
 2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
Daniel Sandler
f3c1c7ea0a Unhide action to launch Daydream settings. 
Bug: 9088316
Change-Id: I70b87e1f320cef4f53b2610a94be8e552dd3a757
 2013-05-29 22:28:22 -04:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Lajos Molnar
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-26 14:40:14 -07:00