OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to...
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates

10 years agoam 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates

10 years agoam 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates

10 years agoresolved conflicts for merge of 534f3e94 to jb-mr1-dev
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of 534f3e94 to jb-mr1-dev

Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394

10 years agoam a3337bc7: Merge "Verify certificates" into jb-dev
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am a3337bc7: Merge "Verify certificates" into jb-dev

* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates

10 years agoMerge "Verify certificates" into jb-dev
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev

10 years agoam 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances

10 years agoam 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances

10 years agoam 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:40:17 +0000 (14:40 -0700)]
am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances

10 years agoam 183f97b7: am 1c12f9e7: malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)]
am 183f97b7: am 1c12f9e7: malloc some advances

* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances

10 years agoam 1c12f9e7: malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am 1c12f9e7: malloc some advances

* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances

10 years agoam 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoDO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 17:33:14 +0000 (18:33 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug

(cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28

10 years agomalloc some advances
Victoria Lease [Mon, 17 Mar 2014 23:03:28 +0000 (16:03 -0700)]
malloc some advances

Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)

10 years agoVerify certificates
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates

b/13418320

Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c

10 years agoam 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:55:31 +0000 (10:55 -0700)]
am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

* commit '3d958f81c54252b452631ea1bb6e7954fc7066c8':
  Show the keyguard if unsecure window on top

10 years agoam 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)]
am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

* commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
  Show the keyguard if unsecure window on top

10 years agoam 1f52437d: Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:47:49 +0000 (10:47 -0700)]
am 1f52437d: Show the keyguard if unsecure window on top

* commit '1f52437de9aa6089a72c7c992f9e7291a6a96115':
  Show the keyguard if unsecure window on top

10 years agoShow the keyguard if unsecure window on top
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top

When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236

10 years agoam ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticato...
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
  Prevent authenticators from using Settings to  launch arbitrary activities.

10 years agoam 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using...
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
  Prevent authenticators from using Settings to  launch arbitrary activities.

10 years agoam 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings...
Paul Lawrence [Thu, 27 Feb 2014 19:24:05 +0000 (11:24 -0800)]
am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.

10 years agoam da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbit...
Paul Lawrence [Thu, 27 Feb 2014 19:20:24 +0000 (11:20 -0800)]
am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
  Prevent authenticators from using Settings to  launch arbitrary activities.

10 years agoam b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:16:49 +0000 (11:16 -0800)]
am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
  Prevent authenticators from using Settings to  launch arbitrary activities.

10 years agoPrevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Wed, 26 Feb 2014 23:42:34 +0000 (15:42 -0800)]
Prevent authenticators from using Settings to  launch arbitrary activities.

Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

This is a backport of 5bab9daf3cf66f4de19f8757e386030e8bef23ce

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2

10 years agoam 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam a87bdc1f: Merge commit \'bc39746e\' into manualmerge
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoMerge commit 'bc39746e' into manualmerge
David Christie [Fri, 10 Jan 2014 21:17:01 +0000 (13:17 -0800)]
Merge commit 'bc39746e' into manualmerge

10 years agoam 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when...
David Christie [Fri, 10 Jan 2014 21:02:48 +0000 (13:02 -0800)]
am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location provider...
David Christie [Fri, 10 Jan 2014 21:00:09 +0000 (13:00 -0800)]
am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled...
David Christie [Fri, 10 Jan 2014 20:55:24 +0000 (12:55 -0800)]
am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoam 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled...
David Christie [Fri, 10 Jan 2014 20:53:41 +0000 (12:53 -0800)]
am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

10 years agoDO NOT MERGE: Clear cached locations when location providers disabled
David Christie [Tue, 7 Jan 2014 02:15:05 +0000 (18:15 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa

10 years agoDO NOT MERGE: Clear cached locations when location providers disabled
David Christie [Tue, 7 Jan 2014 01:57:30 +0000 (17:57 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932

10 years agoam ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permi...
Christopher Tate [Fri, 8 Nov 2013 20:37:43 +0000 (12:37 -0800)]
am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit 'ea198841a9e64d72de49811e0e2c555eb2c40b9b':
  System package permission decls take precedence over 3rd party apps'

10 years agoam ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls...
Christopher Tate [Fri, 8 Nov 2013 20:36:05 +0000 (12:36 -0800)]
am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit 'ef4694cbdd2e374e063d5d89bcb7c4b041c20a30':
  System package permission decls take precedence over 3rd party apps'

10 years agoam ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedenc...
Christopher Tate [Fri, 8 Nov 2013 20:34:13 +0000 (12:34 -0800)]
am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit 'ae229d991711745bdf8da2e716c31efde534e6da':
  System package permission decls take precedence over 3rd party apps'

10 years agoam 43253333: am 50cbfd55: System package permission decls take precedence over 3rd...
Christopher Tate [Fri, 8 Nov 2013 20:31:09 +0000 (12:31 -0800)]
am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit '43253333d24e856a7ffef818fdfaedf3fd60d3b6':
  System package permission decls take precedence over 3rd party apps'

10 years agoam 50cbfd55: System package permission decls take precedence over 3rd party apps\'
Christopher Tate [Fri, 8 Nov 2013 20:27:10 +0000 (12:27 -0800)]
am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit '50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
  System package permission decls take precedence over 3rd party apps'

10 years agoSystem package permission decls take precedence over 3rd party apps'
Christopher Tate [Tue, 5 Nov 2013 20:28:10 +0000 (12:28 -0800)]
System package permission decls take precedence over 3rd party apps'

In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.

Bug 11242510

(Cherry-pick backport to JB)

Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed

10 years agoam f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate...
Amith Yamasani [Fri, 27 Sep 2013 18:23:08 +0000 (11:23 -0700)]
am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit 'f6a0c11615bd5c2c934527a0b20ba13f958913c4':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments...
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '9bf1a1394852ad773d590d1cc60c5e50be8cb1b9':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment...
Amith Yamasani [Fri, 27 Sep 2013 18:17:57 +0000 (11:17 -0700)]
am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:14:23 +0000 (11:14 -0700)]
am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:10:36 +0000 (11:10 -0700)]
am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '427864188dfc5dd803b15797379b9dc6673abd16':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoDon't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Thu, 26 Sep 2013 23:14:36 +0000 (16:14 -0700)]
Don't instantiate non-Fragments in Fragment.instantiate

Backport...

Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d

10 years agoam dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifie...
Kenny Root [Wed, 14 Aug 2013 00:44:27 +0000 (17:44 -0700)]
am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance

* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
  Use hostname verifier directly instead of instance

10 years agoam 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly...
Kenny Root [Wed, 14 Aug 2013 00:42:45 +0000 (17:42 -0700)]
am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance

* commit '1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
  Use hostname verifier directly instead of instance

10 years agoam 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of...
Kenny Root [Wed, 14 Aug 2013 00:36:42 +0000 (17:36 -0700)]
am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance

* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
  Use hostname verifier directly instead of instance

10 years agoam a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:31:32 +0000 (17:31 -0700)]
am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance

* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
  Use hostname verifier directly instead of instance

10 years agoam 32c99004: Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:27:49 +0000 (17:27 -0700)]
am 32c99004: Use hostname verifier directly instead of instance

* commit '32c990044f027542a034a7606cf010dca6df252f':
  Use hostname verifier directly instead of instance

10 years agoUse hostname verifier directly instead of instance
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance

Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56

10 years agoMerge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
Joe Fernandez [Fri, 19 Jul 2013 19:55:47 +0000 (19:55 +0000)]
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

10 years agodocs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Mon, 15 Jul 2013 19:35:05 +0000 (12:35 -0700)]
docs: Android SDK 22.0.4 Release Notes

Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0

10 years agoMerge "fix typo in code sample" into jb-mr1.1-ub-dev
Scott Main [Thu, 18 Jul 2013 22:13:55 +0000 (22:13 +0000)]
Merge "fix typo in code sample" into jb-mr1.1-ub-dev

10 years agofix typo in code sample
Scott Main [Thu, 18 Jul 2013 17:18:57 +0000 (10:18 -0700)]
fix typo in code sample

Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e

10 years agoDoc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:00:35 +0000 (18:00 -0700)]
Doc change: Add Colopl video to carousel and spotlight.

Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93

10 years agoadd warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos

Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3

10 years agoMerge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1...
Scott Main [Fri, 12 Jul 2013 01:03:22 +0000 (01:03 +0000)]
Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev

10 years agoam d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb...
Dirk Dougherty [Fri, 12 Jul 2013 00:56:35 +0000 (17:56 -0700)]
am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'd6bbda24150eddc59865133377f6b41c8a1ed3b5':
  Doc change: Update gcore reference docs.

10 years agoam bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Dirk Dougherty [Fri, 12 Jul 2013 00:54:00 +0000 (17:54 -0700)]
am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'bc5f9b66744b76c676543902d31d324f2dd02d09':
  Doc change: Update gcore reference docs.

10 years agoMerge "Doc change: Update gcore reference docs." into jb-mr1.1-docs
Dirk Dougherty [Fri, 12 Jul 2013 00:50:59 +0000 (00:50 +0000)]
Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

10 years agofix markup error in download button and fix transition to install/update guide
Scott Main [Fri, 12 Jul 2013 00:26:13 +0000 (17:26 -0700)]
fix markup error in download button and fix transition to install/update guide

Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016

10 years agoupdate Android Studio for v0.2.0.
Scott Main [Thu, 11 Jul 2013 22:31:10 +0000 (15:31 -0700)]
update Android Studio for v0.2.0.
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9

10 years agoadd Toshiba usb driver link
Scott Main [Tue, 9 Jul 2013 17:43:45 +0000 (10:43 -0700)]
add Toshiba usb driver link
delete Fujitsu-Toshiba
bug: 9755017

Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364

10 years agoDoc change: Update gcore reference docs.
Dirk Dougherty [Fri, 28 Jun 2013 21:04:39 +0000 (14:04 -0700)]
Doc change: Update gcore reference docs.

Change-Id: I9064969741598663ba7a732054ee378d3a14da7e

10 years agoMerge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev
Scott Main [Tue, 9 Jul 2013 17:50:18 +0000 (17:50 +0000)]
Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

10 years agoMerge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
Dirk Dougherty [Tue, 9 Jul 2013 17:50:07 +0000 (17:50 +0000)]
Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev

10 years agoupdate url for backup service key
Scott Main [Tue, 9 Jul 2013 17:48:02 +0000 (10:48 -0700)]
update url for backup service key
bug: 8834302

Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771

10 years agoam a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 17:01:42 +0000 (10:01 -0700)]
am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training

* commit 'a59eb93d1954a36b25a6277c0ce3145ce115d460':
  Doc Bug: b9739899 Bugs in Sync Adapters training

10 years agoam a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training
Joe Malin [Tue, 9 Jul 2013 16:59:10 +0000 (09:59 -0700)]
am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training

* commit 'a62413772e6b5dad3a018c667ded5412e235c142':
  Doc Bug: b9739899 Bugs in Sync Adapters training

10 years agoadd link to cloud backend blog post
Scott Main [Tue, 9 Jul 2013 00:29:22 +0000 (17:29 -0700)]
add link to cloud backend blog post

Change-Id: I38376ff9ceaa7338f03cdfe6cd1685efafa1a4e2

10 years agodocs: add link to developer survey on main landing pages
Scott Main [Wed, 5 Dec 2012 02:23:09 +0000 (18:23 -0800)]
docs: add link to developer survey on main landing pages

Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76

10 years agoDoc Bug: b9739899 Bugs in Sync Adapters training
Joe Malin [Mon, 8 Jul 2013 22:37:34 +0000 (15:37 -0700)]
Doc Bug: b9739899 Bugs in Sync Adapters training

Change-Id: Ia6f0fc79c73dd66a1d8306e49ff51fc29fb62c7f

10 years agoadd xxhdpi information to tablet checklist
Scott Main [Mon, 8 Jul 2013 18:11:52 +0000 (11:11 -0700)]
add xxhdpi information to tablet checklist

Change-Id: I8eff162527a9de59c667a7152b70eed7590ddbe3

10 years agodashboard update for 7/8
Scott Main [Mon, 8 Jul 2013 16:53:24 +0000 (09:53 -0700)]
dashboard update for 7/8

Change-Id: I4935d5544754bbbd1ceb3d535ad5cb9a5dbe2453

10 years agoam 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training
Joe Malin [Mon, 8 Jul 2013 17:19:25 +0000 (10:19 -0700)]
am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training

* commit '8b3c7d0c8fec82a6ad32abcb7e78416d8513512d':
  DOC: Sync Adapters Android Training

10 years agoam c355a1c1: DOC: Sync Adapters Android Training
Joe Malin [Mon, 8 Jul 2013 17:17:08 +0000 (10:17 -0700)]
am c355a1c1: DOC: Sync Adapters Android Training

* commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5':
  DOC: Sync Adapters Android Training

10 years agoDOC: Sync Adapters Android Training
Joe Malin [Fri, 7 Jun 2013 20:38:00 +0000 (13:38 -0700)]
DOC: Sync Adapters Android Training

Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
(cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)

10 years agoam 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:32:54 +0000 (01:32 -0700)]
am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.

* commit '1c1113958d4e27018b02ce793809d541158440f6':
  Doc change: edits to education opt-in docs.

10 years agoam 8451fc4f: Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:30:58 +0000 (01:30 -0700)]
am 8451fc4f: Doc change: edits to education opt-in docs.

* commit '8451fc4f8660842b21e4ed3bddaedb0eb9490855':
  Doc change: edits to education opt-in docs.

10 years agoDoc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 07:30:38 +0000 (00:30 -0700)]
Doc change: edits to education opt-in docs.

Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052

10 years agoam 9db29158: am f812258e: Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:39:30 +0000 (19:39 -0700)]
am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.

10 years agoam f812258e: Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:37:14 +0000 (19:37 -0700)]
am f812258e: Doc change: add docs for edu opt-in.

* commit 'f812258e5ca9449402781a7330c0e3696f566e09':
  Doc change: add docs for edu opt-in.

10 years agoDoc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 00:33:15 +0000 (17:33 -0700)]
Doc change: add docs for edu opt-in.

Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4

10 years agoam cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id:...
kmccormick [Fri, 21 Jun 2013 17:57:38 +0000 (10:57 -0700)]
am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit 'cce880028ee694e296d2585b8932868b14f71223':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

10 years agoam 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724...
kmccormick [Fri, 21 Jun 2013 17:56:13 +0000 (10:56 -0700)]
am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

* commit '9c309d3db95b1fc63925a18b81e6ceabcaa18407':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

10 years agoCherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb...
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322

Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f

10 years agoam e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:31:48 +0000 (15:31 -0700)]
am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.

* commit 'e4bc7d812199a8d371da264575c74874877d4824':
  Doc change: add video for edu page.

10 years agoam 6cb24e40: Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:29:27 +0000 (15:29 -0700)]
am 6cb24e40: Doc change: add video for edu page.

* commit '6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
  Doc change: add video for edu page.

10 years agoDoc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 20:52:21 +0000 (13:52 -0700)]
Doc change: add video for edu page.

Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df

10 years agoMerge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev
Scott Main [Tue, 18 Jun 2013 22:26:45 +0000 (22:26 +0000)]
Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev

10 years agoadd Arabic Google Play badges to generator
Scott Main [Fri, 14 Jun 2013 17:58:51 +0000 (10:58 -0700)]
add Arabic Google Play badges to generator
bug: 7994508

Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16

10 years agoreplace 'developers strick back' with 'this week in android' playlist
Scott Main [Tue, 18 Jun 2013 00:47:36 +0000 (17:47 -0700)]
replace 'developers strick back' with 'this week in android' playlist

Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c

10 years agofix transition from download to install instructions
Scott Main [Fri, 14 Jun 2013 17:49:55 +0000 (10:49 -0700)]
fix transition from download to install instructions

Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9

10 years agochange studio version number to use 'x' for final decimal.
Scott Main [Thu, 13 Jun 2013 22:00:43 +0000 (15:00 -0700)]
change studio version number to use 'x' for final decimal.
also go to install guide after download begins

Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc

10 years agoMerge "add ninepatch search tag" into jb-mr1.1-ub-dev
Scott Main [Thu, 13 Jun 2013 21:47:27 +0000 (21:47 +0000)]
Merge "add ninepatch search tag" into jb-mr1.1-ub-dev