OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)]
am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working

10 years agoam 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:18:36 +0000 (19:18 +0000)]
am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working

10 years agoFix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:05:11 +0000 (12:05 -0700)]
Fix FLAG_DISMISS_KEYGUARD not working

Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc

10 years agoam 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs...
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

10 years agoam 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

10 years agoMerge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

10 years agoAllow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.

Fixes bug 13225149.

Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4

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 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 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 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 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 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 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

11 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'

11 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'

11 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'

11 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'

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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.

11 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

11 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

11 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

11 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

11 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

11 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)

11 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.

11 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

11 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.

11 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

11 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

11 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

11 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.

11 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

11 years agoam bf370185: Doc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 02:26:57 +0000 (19:26 -0700)]
am bf370185: Doc update: restoring deprecation messages

* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages

11 years agoDoc update: restoring deprecation messages
kmccormick [Thu, 13 Jun 2013 01:58:49 +0000 (18:58 -0700)]
Doc update: restoring deprecation messages

Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef

11 years agoam fe3da794: Doc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:31:26 +0000 (18:31 -0700)]
am fe3da794: Doc change: refresh gcore/gms reference from e-release.

* commit 'fe3da794f7fb26325951338b1951bb6fdbbc0199':
  Doc change: refresh gcore/gms reference from e-release.

11 years agoDoc change: refresh gcore/gms reference from e-release.
Dirk Dougherty [Thu, 13 Jun 2013 01:06:08 +0000 (18:06 -0700)]
Doc change: refresh gcore/gms reference from e-release.

Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4

11 years agoam 57bb89f0: Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:33:37 +0000 (17:33 -0700)]
am 57bb89f0: Doc change: Add docs for GP Purchase Status API.

* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
  Doc change: Add docs for GP Purchase Status API.

11 years agoDoc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Wed, 12 Jun 2013 03:10:54 +0000 (20:10 -0700)]
Doc change: Add docs for GP Purchase Status API.

Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00

11 years agoam 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into...
Dirk Dougherty [Thu, 6 Jun 2013 17:39:22 +0000 (10:39 -0700)]
am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs

* commit '16fdbd1729e9473f6176c88c59538fc5c371154f':
  Doc change: fix broken link to localization checklist.

11 years agoMerge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
Dirk Dougherty [Thu, 6 Jun 2013 17:36:29 +0000 (17:36 +0000)]
Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs

11 years agoDoc change: fix broken link to localization checklist.
Dirk Dougherty [Thu, 6 Jun 2013 17:34:40 +0000 (10:34 -0700)]
Doc change: fix broken link to localization checklist.

Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7

11 years agoam db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
kmccormick [Thu, 6 Jun 2013 01:25:12 +0000 (18:25 -0700)]
am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
  Doc update: Refactoring to client/server.

11 years agoMerge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
kmccormick [Thu, 6 Jun 2013 01:22:54 +0000 (01:22 +0000)]
Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

11 years agoDoc update: Refactoring to client/server.
kmccormick [Fri, 31 May 2013 02:06:41 +0000 (19:06 -0700)]
Doc update: Refactoring to client/server.

Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b

11 years agoam 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:07:16 +0000 (10:07 -0700)]
am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView

* commit '10d96950c14ae647c2e8435178533cafc78e1afa':
  DOC CHANGE: Clarify textIsSelectable in TextView

11 years agoDOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Thu, 30 May 2013 00:49:09 +0000 (17:49 -0700)]
DOC CHANGE: Clarify textIsSelectable in TextView

Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b

11 years agoam 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
Dirk Dougherty [Tue, 4 Jun 2013 02:11:26 +0000 (19:11 -0700)]
am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs

* commit '8e307adcf62c639d25c16f6071d458561ce4bef3':
  Doc change: Add new developer video.

11 years agoMerge "Doc change: Add new developer video." into jb-mr1.1-docs
Dirk Dougherty [Tue, 4 Jun 2013 02:08:20 +0000 (02:08 +0000)]
Merge "Doc change: Add new developer video." into jb-mr1.1-docs

11 years agoDoc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 01:39:52 +0000 (18:39 -0700)]
Doc change: Add new developer video.

Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7

11 years agoam b6a35268: B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:17:15 +0000 (14:17 -0700)]
am b6a35268B9257437: Typo in javadoc for AccountManager

* commit 'b6a35268ccb698cde6d2e1e2f475a7299112b034':
  B9257437: Typo in javadoc for AccountManager

11 years agoB9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 16:49:04 +0000 (09:49 -0700)]
B9257437: Typo in javadoc for AccountManager

Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6

11 years agoam 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL."...
Dirk Dougherty [Sat, 1 Jun 2013 15:21:25 +0000 (08:21 -0700)]
am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs

* commit '4fad5c176a245203c1f8d26397ef6cc838753357':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.

11 years agoMerge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1...
Dirk Dougherty [Fri, 31 May 2013 21:08:45 +0000 (21:08 +0000)]
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs

11 years agoam 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 20:31:23 +0000 (13:31 -0700)]
am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs

* commit '3886fad5d1c50dd14b11185104401887bc129c7f':
  Doc Update: fix host title in main doc.

11 years agoMerge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 20:28:57 +0000 (20:28 +0000)]
Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs

11 years agoDoc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 19:28:05 +0000 (12:28 -0700)]
Doc Update: fix host title in main doc.

Change-Id: Ide683eb651ea7b485dae6c4d348b19a8d988187b

11 years agoam 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs
Joe Malin [Fri, 31 May 2013 16:02:06 +0000 (09:02 -0700)]
am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs

* commit '59e24472f3fb4f3dc5d1acee40efd6b8b4d66bd7':
  Fix #8499531: Command line instructions

11 years agoMerge "Fix #8499531: Command line instructions" into jb-mr1.1-docs
Joe Malin [Fri, 31 May 2013 16:00:04 +0000 (16:00 +0000)]
Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs

11 years agoFix #8499531: Command line instructions
Joe Malin [Thu, 28 Mar 2013 18:34:05 +0000 (11:34 -0700)]
Fix #8499531: Command line instructions

Change-Id: I4922855443f1f85e52ad4016ea3e33925c60e08e

11 years agoam b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
kmccormick [Thu, 30 May 2013 18:52:11 +0000 (11:52 -0700)]
am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs

* commit 'b3803855b0554879836c18b4157194b9c2061219':
  Doc change: document AppWidgetHost

11 years agoMerge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
kmccormick [Thu, 30 May 2013 18:48:27 +0000 (18:48 +0000)]
Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs

11 years agoDoc change: document AppWidgetHost
kmccormick [Sat, 2 Mar 2013 00:13:21 +0000 (16:13 -0800)]
Doc change: document AppWidgetHost

"Bug: 75400546984998"

Change-Id: Ice48c7023687d0a4aea95a4a10212e6fdd66363f

11 years agoDoc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Wed, 29 May 2013 22:19:14 +0000 (15:19 -0700)]
Doc change: restore warning not to abort NEW_OUTGOING_CALL.

Change-Id: Icdd4ae184b2a989ac2967420cb5b471aac70808f

11 years agoam e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1...
Joe Malin [Wed, 29 May 2013 22:16:45 +0000 (15:16 -0700)]
am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs

* commit 'e55ba43171cb46cc95aa90f83524c4751c7030ff':
  Docs bug fix: B9085293 - Stop Location Updates

11 years agoMerge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs
Joe Malin [Wed, 29 May 2013 21:30:44 +0000 (21:30 +0000)]
Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs