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

94314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
c6e41cf268 am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes" 
* commit '28a7a05952b7c338f2c1746cb20a17e28358bffc':
  frameworks/base: Support for LTE network modes
 2013-01-03 15:19:14 -08:00
Wink Saville
28a7a05952 am 881d5387: Merge "frameworks/base: Support for LTE network modes" 
* commit '881d5387a3e92fa30f5966f00a04c4a33af8f18b':
  frameworks/base: Support for LTE network modes
 2013-01-03 15:14:15 -08:00
Wink Saville
881d5387a3 Merge "frameworks/base: Support for LTE network modes" 2013-01-03 14:49:05 -08:00
Scott Main
3668703021 am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit 'cd7b6a947060dfa3da58acbba039274103077757':
  docs: dashboard update for 1/3/13
 2013-01-03 11:54:51 -08:00
Scott Main
cd7b6a9470 am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '7b31032051f430e03ac05503410b687fd289bdc3':
  docs: dashboard update for 1/3/13
 2013-01-03 11:51:27 -08:00
Scott Main
7b31032051 am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '90c0548c057f0c26c4dcd215ee64e787460c4c6e':
  docs: dashboard update for 1/3/13
 2013-01-03 11:49:45 -08:00
Scott Main
90c0548c05 am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
  docs: dashboard update for 1/3/13
 2013-01-03 11:47:20 -08:00
Scott Main
9fe82f1bc7 Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 2013-01-03 11:44:43 -08:00
Scott Main
b318318e0a docs: dashboard update for 1/3/13 
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
 2013-01-03 11:39:34 -08:00
Xavier Ducrohet
5d00421157 am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge. 
* commit 'e92b9706df09730e60c1e9ae17d4157c2c118825':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:52:37 -08:00
Xavier Ducrohet
e92b9706df am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge. 
* commit '816fd074cfc32fd3323163dd0c358e249f9cbf56':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:49:28 -08:00
Xavier Ducrohet
816fd074cf am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge. 
* commit 'afa4d8bfafdd42b75dc15d31c0962c252f304138':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:46:34 -08:00
Xavier Ducrohet
afa4d8bfaf am 22d7cf23: Add single crunch command to aapt. do not merge. 
* commit '22d7cf239d8a9b009ea7adf86d8826a8a8116d03':
  Add single crunch command to aapt. do not merge.
 2013-01-03 10:43:39 -08:00
Xavier Ducrohet
22d7cf239d Add single crunch command to aapt. do not merge. 
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
 2013-01-02 15:41:52 -08:00
Victoria Lease
380b45b805 am 73e243c4: Merge "Fix logging typos in GpsLocationProvider" 
* commit '73e243c4d271907d10f10b301b2d6854e1f63fe4':
  Fix logging typos in GpsLocationProvider
 2013-01-02 14:46:48 -08:00
Victoria Lease
73e243c4d2 Merge "Fix logging typos in GpsLocationProvider" 2013-01-02 14:15:51 -08:00
Uma Maheswari Ramalingam
ec7f4a6953 frameworks/base: Support for LTE network modes 
Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
 2013-01-02 14:05:58 -08:00
Amith Yamasani
ff0cb3737b am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit '554ed0f0347acc568ab1e73621789423c953f693':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:03:21 -08:00
Amith Yamasani
554ed0f034 Merge "Fixed typo in Recreating an Activity documentation" 2013-01-02 09:00:28 -08:00
Elliott Hughes
2fbc67abb9 am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit '5cb0f2184656642160e9ac032d0646f766058a5b':
  StringBlock_nativeCreate: Possible Leak
 2012-12-21 18:13:29 -08:00
Elliott Hughes
5cb0f21846 Merge "StringBlock_nativeCreate: Possible Leak" 2012-12-21 17:17:42 -08:00
Scott Main
1a9c5a5f82 am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '96f0e00825cf1bf0f14c358b87394b426020a77b':
  docs: add class on keyboards
 2012-12-21 16:40:25 -08:00
Scott Main
96f0e00825 am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '481102eed6d8eaff07489717bde7fc59a5dea5bf':
  docs: add class on keyboards
 2012-12-21 16:38:09 -08:00
Scott Main
51627153b9 am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '8c8fd247a6a7f49031251ba11036779a41d9a2bf':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:33:40 -08:00
Scott Main
8c8fd247a6 am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'cee5267b766ce44ddf2faa1f32f2b79d49f088ac':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:30:33 -08:00
Scott Main
481102eed6 am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '0dae634b06f5dc6039a5aaa9c0f00250e10c6547':
  docs: add class on keyboards
 2012-12-21 16:29:16 -08:00
Scott Main
0dae634b06 Merge "docs: add class on keyboards" into jb-mr1-dev 2012-12-21 16:25:50 -08:00
Scott Main
cee5267b76 am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'dc2c1a0f80042c42768fd868791e21412c3839b9':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:25:36 -08:00
Scott Main
c8a6f8a041 docs: add class on keyboards 
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
 2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80 docs: add explanation of default permissions to Permission guide 
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930
 2012-12-21 16:19:52 -08:00
James Dong
edde28fd09 am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit '5d5526aa86888cb0891f535823dc93e154f38b2e':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-21 14:42:42 -08:00
James Dong
0c1e566f97 am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit 'c8db3b8ae34c76430e8e97418e485dedc44d0954':
  Set "isdrm" info in Mediastore
 2012-12-21 14:42:37 -08:00
Gulshan Singh
870d2a2988 Fixed typo in Recreating an Activity documentation 
The word although was spelled as althought. This is now fixed.
Signed-off-by: Gulshan Singh <gsingh2011@gmail.com>

Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
 2012-12-21 17:13:43 -05:00
The Android Open Source Project
57ebeed61f Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ibb842a678a67174de54e4174345379e67bc7bf8d
 2012-12-21 14:10:56 -08:00
James Dong
5d5526aa86 Merge "Handle errors from AudioEffect::queryNumberEffects" 2012-12-21 14:05:09 -08:00
The Android Automerger
ceb464b6a6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-21 13:46:51 -08:00
James Dong
c8db3b8ae3 Merge "Set "isdrm" info in Mediastore" 2012-12-21 13:34:42 -08:00
kmccormick@google.com
12f2f8dcd7 am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '87d852a84de0d691bce127f65bc7c4ba75883e2e':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:52:28 -08:00
kmccormick@google.com
87d852a84d am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit 'ec6d08475ee1a2020556b43b4698b60dcb56a9c6':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:51:02 -08:00
kmccormick@google.com
ec6d08475e am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '5b03460fcb69394b984fad1a63e244f9aa798886':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:46:03 -08:00
&& repo sync -j8
5b03460fcb Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 2012-12-21 12:43:20 -08:00
Magnus Eriksson
160c1ca117 Fix logging typos in GpsLocationProvider 
Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
 2012-12-21 21:07:28 +01:00
Irfan Sheriff
7f93e7d265 am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-21 10:07:24 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
The Android Open Source Project
ac0fd12413 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
 2012-12-20 15:46:28 -08:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
The Android Automerger
345f7fcfaf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-20 14:31:16 -08:00
Victoria Lease
5ddfa24776 am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit 'fc56015bd3d86e470fdf3ac8449776809124875e':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:47:07 -08:00
You Kim
218a313bb0 StringBlock_nativeCreate: Possible Leak 
osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
 2012-12-21 06:19:38 +09:00
Dirk Dougherty
b7f4bf3604 am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:55:39 -08:00