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

95311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
c19b866158 am ef631700: am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'ef631700eb26a47820eeab2b2450dcfb4213af5c':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:49:26 -08:00
Trevor Johns
ef631700eb am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'b02ca5efd995f167ccd90fc56572033e88b57032':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:45:41 -08:00
Trevor Johns
b02ca5efd9 am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '0c9f413b898341e2d20ae6045ce0f71e39cf97a4':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:42:36 -08:00
Trevor Johns
0c9f413b89 am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-06 17:02:55 -08:00
Trevor Johns
58a54cb380 [docs] Fix issue #8288695: Typo in OAuth2 training 
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
 2013-03-06 14:46:47 -08:00
Irfan Sheriff
17d8963653 am 011b8efc: Merge "frameworks/base: stop find before issuing wps pbc." 
* commit '011b8efce194529de82e94fd0c0bf29835b9f07a':
  frameworks/base: stop find before issuing wps pbc.
 2013-03-06 08:54:49 -08:00
Irfan Sheriff
011b8efce1 Merge "frameworks/base: stop find before issuing wps pbc." 2013-03-06 15:58:42 +00:00
Deepthi Gowri
575bb45e9d frameworks/base: stop find before issuing wps pbc. 
Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.

Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
 2013-03-06 08:24:03 +05:30
Victoria Lease
263554ae5f am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 15:51:19 -08:00
Victoria Lease
8ef243cf86 am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit 'f45efd276c9b09adcb97ea43afc806731583aac7':
  Audio continue to played even if paused manually
 2013-03-05 15:51:16 -08:00
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Victoria Lease
f45efd276c Merge "Audio continue to played even if paused manually" 2013-03-05 23:20:45 +00:00
Scott Main
ecc0cdddd5 am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '570cd32254903213ac1d54241401205bc129a035':
 2013-03-05 15:15:28 -08:00
Scott Main
ef3bea6cd8 am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '4be483dac8eb1024ad9298d582ad2a7068cf5822':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:11:53 -08:00
Scott Main
570cd32254 am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'baff6645d5c6d6b5461c24605c931515ef3217c9':
 2013-03-05 15:11:49 -08:00
Scott Main
baff6645d5 am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '1fdb80caae9ffb3d6178de77097a8f09a23fc4fa':
 2013-03-05 15:09:25 -08:00
Scott Main
4be483dac8 am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'f37669ffcfab9abdb99f378d8b9b88c974538b9f':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:08:28 -08:00
Scott Main
1fdb80caae am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '9ea1bacaddb34933ce1dc73780bd868548d5ca2c':
 2013-03-05 15:06:46 -08:00
Scott Main
f37669ffcf am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'd6e8a00b0b7ebcd1aa807e694cee85db496711e0':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:06:06 -08:00
Scott Main
9ea1bacadd am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '23513a2c856c1810e10425bcec4296df2be01584':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:04:01 -08:00
Scott Main
d6e8a00b0b am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '23513a2c856c1810e10425bcec4296df2be01584':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:03:53 -08:00
Elliott Hughes
582c5b85c5 am 690d3435: Merge "jni: remove obsolete flag from makefile" 
* commit '690d3435a4564f6ea7b37e1c6446b5301aeca6b6':
  jni: remove obsolete flag from makefile
 2013-03-05 14:40:59 -08:00
Elliott Hughes
690d3435a4 Merge "jni: remove obsolete flag from makefile" 2013-03-05 22:30:58 +00:00
Bruce Beare
d625127db9 jni: remove obsolete flag from makefile 
Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2013-03-05 14:29:46 -08:00
quddusc
56b9ccaf40 am 9956455a: am 21637c0f: am ea22f73a: am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit '9956455a6f2bb62421659287e267e69484a51612':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:18:14 -08:00
quddusc
9956455a6f am 21637c0f: am ea22f73a: am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit '21637c0f79e901eda2718ceddde61bb11b3b0294':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:16:23 -08:00
quddusc
21637c0f79 am ea22f73a: am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit 'ea22f73a5e31e5ab8a5bb7e62651a8282d1b43c9':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:14:03 -08:00
quddusc
ea22f73a5e am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit 'd5bf7fbd7accd00fca25b9f4ad3789ab064b38a8':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:12:02 -08:00
quddusc
d5bf7fbd7a Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 2013-03-05 22:09:39 +00:00
Scott Main
f3996b9e76 am de9929ac: am 80c95d46: am a73e6ca8: am c7c3beff: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit 'de9929ac37d83ea987eeb3d2c45d8d6c00b45691':
 2013-03-05 13:14:09 -08:00
Joe Malin
d6afc6c8da am f235d82e: am 89e2acff: am 3d0872d0: am 91dad7e8: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit 'f235d82e1155cc056c4c40e156309e1b2f64d145':
 2013-03-05 13:14:06 -08:00
Adam Koch
0a5d168244 am 524b3a2f: am 89332de6: am 22f4e694: am e43d5714: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '524b3a2f706059881256ed8ae657f4fb7bfe290e':
 2013-03-05 13:14:04 -08:00
Scott Main
08b0fd7331 am f0a06d5d: am 69220582: am bc8abbf0: am 0793c6e8: dashboard update for 4/4/13 
* commit 'f0a06d5dbe975ca314cccbb5080121239f1c1d59':
  dashboard update for 4/4/13
 2013-03-05 13:14:01 -08:00
Jeff Sharkey
53541b1d20 am 60dcf0bd: am 09d621b6: am da38ddc2: am f9ed7dc9: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '60dcf0bd0994f8ce7aaa97158e66dc0ad8478b79':
 2013-03-05 13:13:59 -08:00
Scott Main
8da6d252fc am ce4e83f3: am e7818c1f: am 9daf107d: am 10dda9ca: am 00158363: docs: add bdc\'s security doc as training article 
* commit 'ce4e83f3d52377b23d17f4bdc20f12b89f730148':
 2013-03-05 13:13:56 -08:00
Dirk Dougherty
bfb2801a10 am 6f5de133: am f67c5a74: am e1d8df45: am f80cb186: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit '6f5de133446f7d90d85d57d38eef4a34c9ea26a4':
 2013-03-05 13:13:53 -08:00
Scott Main
42accb4794 am 2198945e: am 95120553: am fbd852ba: am 9ecd8e7b: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit '2198945e3231f3a2fc2b1e8d00bfa8f322abfd3a':
 2013-03-05 13:13:51 -08:00
Scott Main
47c59b4835 am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '01798b0553ffd504b0012a8f3ffb7a8d3c1be641':
  docs: clarify startActivity
 2013-03-05 13:13:48 -08:00
quddusc
2a1ac70579 am e772ce34: am 3a3290e3: am 096c7f7b: am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 
* commit 'e772ce348ce99bc3edbfec186ff416cb2735113f':
  docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
 2013-03-05 13:13:45 -08:00
Dirk Dougherty
4ac0a047e1 am 5e1b295e: am 43c9a956: am 3f52bde0: am 694602ae: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
* commit '5e1b295eb64bef1c1d4f076fdc57aa29ae8832be':
 2013-03-05 13:13:42 -08:00
Scott Main
588e5a967c am d4ab04c9: am d16b81d0: am 45c5288c: am 8da34d97: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit 'd4ab04c93f5b23030d1c8cdc068974368424e499':
 2013-03-05 13:13:39 -08:00
Scott Main
b177ddf14e am 16a4a50b: am 2df5d04e: am b3ff35ad: am 06706ba5: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '16a4a50b4662b417dae1f7ed20edd7761c46ffaf':
 2013-03-05 13:13:36 -08:00
Jean-Baptiste Queru
4d8032b5e6 am f3b63ed1: am 67128cbc: (-s ours) am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14':
 2013-03-05 13:13:33 -08:00
Dirk Dougherty
da2a4a5048 am ec29e793: am 27ae21a3: am a0c2afbd: am bde26777: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'ec29e793addbad4a2b80e2af63ef031cda1d1076':
 2013-03-05 13:13:30 -08:00
Robert Ly
88b1c78ad4 am 110738f9: am 566cb8a2: am bd181401: am 9d09eee5: am af7b843e: docs: remove games references 
* commit '110738f94b8ffed733ac6fa130dbdfbd07a8393f':
 2013-03-05 13:13:28 -08:00
Robert Ly
605c86b81c am 5808b64d: am bb416084: am 0e4e61f1: am 1878d080: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '5808b64d4c1873bd0bdef0540d1f435789e96cb8':
 2013-03-05 13:13:25 -08:00
Robert Ly
ea3a4ce8db am b4266f54: am 2f7eb121: am bc382d06: am 82370a60: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'b4266f54ded1de5c8aa5b4c29153e120d80d16f4':
 2013-03-05 13:13:23 -08:00
Joe Malin
8171f41535 am a2479606: am e62febda: am 7865c6f0: am e35ae88b: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'a24796063a40d8c88d272b0e789d2e6e751e7e84':
 2013-03-05 13:13:20 -08:00
Scott Main
e601e06cc2 am 81438426: am 891ee0b1: am 552ac879: am cdc57997: am d51eebae: docs: add google io registration announcement to home page 
* commit '81438426eb1df0a3078addb0e92681446edfd262':
 2013-03-05 13:13:18 -08:00
Dirk Dougherty
85251de13e am b1f2ee7d: am d8b07df6: am ed40f2a6: am 2caba1f7: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'b1f2ee7db651f4a9b75b7cc6f24f9faa68214207':
 2013-03-05 13:13:15 -08:00