OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that...
David Friedman [Tue, 18 Aug 2015 05:14:12 +0000 (05:14 +0000)]
am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '878acada08c49214b720fdd57b8150407a4e223f':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs

9 years agoam d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge...
David Friedman [Tue, 18 Aug 2015 05:07:15 +0000 (05:07 +0000)]
am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit 'd7792759e703200c833736df276915958588cad4':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs

9 years agoam 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from...
David Friedman [Tue, 18 Aug 2015 05:00:50 +0000 (05:00 +0000)]
am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '5f89ce649c6385bd6463641c5408cc7a274b0eb6':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs

9 years agoam 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview...
David Friedman [Tue, 18 Aug 2015 04:54:58 +0000 (04:54 +0000)]
am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs

9 years agoMerge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into...
David Friedman [Tue, 18 Aug 2015 04:50:23 +0000 (04:50 +0000)]
Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev

9 years agoam d29dd0c9: am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when...
Filip Gruszczynski [Tue, 18 Aug 2015 02:31:05 +0000 (02:31 +0000)]
am d29dd0c9: am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit 'd29dd0c98633e274499ec4177e48a62644175912':
  Clear old clip rect when creating new surface.

9 years agoam b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new...
Filip Gruszczynski [Tue, 18 Aug 2015 02:25:00 +0000 (02:25 +0000)]
am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit 'b59404a1f590091f0c3cd22b69de1b55154ef580':
  Clear old clip rect when creating new surface.

9 years agoam eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface."...
Filip Gruszczynski [Tue, 18 Aug 2015 02:19:51 +0000 (02:19 +0000)]
am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit 'eb2f302d119faaaf5d63f23f0921da9d756da5b4':
  Clear old clip rect when creating new surface.

9 years agoam 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
Filip Gruszczynski [Tue, 18 Aug 2015 02:12:47 +0000 (02:12 +0000)]
am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev

* commit '610008c0ebf5ea4556b4825eac521b2b16f1a66c':
  Clear old clip rect when creating new surface.

9 years agoMerge "Clear old clip rect when creating new surface." into mnc-dev
Filip Gruszczynski [Tue, 18 Aug 2015 02:04:57 +0000 (02:04 +0000)]
Merge "Clear old clip rect when creating new surface." into mnc-dev

9 years agoam cfd288b8: am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get...
Dianne Hackborn [Tue, 18 Aug 2015 01:49:22 +0000 (01:49 +0000)]
am cfd288b8: am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

* commit 'cfd288b8581fa4170afefaa0ea146279d5df87ac':
  Fix issue #23214751: Get a GPS fix before going in to doze

9 years agoDocs: Fixing files that didn't merge properly from mnc-preview-docs
David Friedman [Tue, 18 Aug 2015 01:15:50 +0000 (18:15 -0700)]
Docs: Fixing files that didn't merge properly from mnc-preview-docs

Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043

9 years agoam 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix...
Dianne Hackborn [Tue, 18 Aug 2015 01:41:45 +0000 (01:41 +0000)]
am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

* commit '5211c0630bc5ab3026dd29e1640ddc83590e3219':
  Fix issue #23214751: Get a GPS fix before going in to doze

9 years agoam 591b371f: am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outca...
Chris Tate [Tue, 18 Aug 2015 01:36:05 +0000 (01:36 +0000)]
am 591b371f: am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit '591b371fbb07cb4db5cd556aa6b52936557e8382':
  Clean up properly if outcall for doRestoreFinished() fails

9 years agoam 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going...
Dianne Hackborn [Tue, 18 Aug 2015 01:35:14 +0000 (01:35 +0000)]
am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

* commit '6da89844d422477c0f90f3b97f96c64f3bccb3fb':
  Fix issue #23214751: Get a GPS fix before going in to doze

9 years agoam ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRest...
Chris Tate [Tue, 18 Aug 2015 01:28:13 +0000 (01:28 +0000)]
am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit 'ccbb02f9b91a2fe631487c5644996c7dde567950':
  Clean up properly if outcall for doRestoreFinished() fails

9 years agoam 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into...
Dianne Hackborn [Tue, 18 Aug 2015 01:26:10 +0000 (01:26 +0000)]
am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

* commit '12b9c2d6aa77d25848f81d84e34367a46d09d2af':
  Fix issue #23214751: Get a GPS fix before going in to doze

9 years agoam b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished...
Chris Tate [Tue, 18 Aug 2015 01:21:05 +0000 (01:21 +0000)]
am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit 'b16cd62c676dc219c0f31495ad13aeb0381fee0e':
  Clean up properly if outcall for doRestoreFinished() fails

9 years agoMerge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev
Dianne Hackborn [Tue, 18 Aug 2015 01:17:00 +0000 (01:17 +0000)]
Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev

9 years agoam c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into...
Chris Tate [Tue, 18 Aug 2015 01:13:24 +0000 (01:13 +0000)]
am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
  Clean up properly if outcall for doRestoreFinished() fails

9 years agoMerge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
Chris Tate [Tue, 18 Aug 2015 01:07:50 +0000 (01:07 +0000)]
Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev

9 years agoClear old clip rect when creating new surface.
Filip Gruszczynski [Tue, 18 Aug 2015 00:42:04 +0000 (17:42 -0700)]
Clear old clip rect when creating new surface.

This fixes an issue where a window state animator holds on to old clip
rect from previous transition and applies it to the newly created surface.

Bug: 22851074
Change-Id: Ic416a2a0c5d0f69fc80d5656541256ade41c9c36

9 years agoam 338b0556: am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists...
Quddus Chong [Tue, 18 Aug 2015 00:15:33 +0000 (00:15 +0000)]
am 338b0556: am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '338b05560de148096ab6a92deb11ab908686b42f':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

9 years agoam 33c9093e: am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post...
Joe Fernandez [Tue, 18 Aug 2015 00:08:28 +0000 (00:08 +0000)]
am 33c9093e: am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

* commit '33c9093e13c85e95f8a86d8bcfd6033c3e506aea':
  docs: M Preview 3 post-release cleanup

9 years agoam 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lis...
Quddus Chong [Tue, 18 Aug 2015 00:06:52 +0000 (00:06 +0000)]
am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '905af2b46285a66b4921a39f324465b727fe00bd':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

9 years agoam 13bf77ed: am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_lan...
Amit Mahajan [Tue, 18 Aug 2015 00:02:03 +0000 (00:02 +0000)]
am 13bf77ed: am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

* commit '13bf77ed0a96a286b4503b6f30ba8dcef943d27d':
  Setting config_use_sim_language_file to false for 334-020.

9 years agoam a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup...
Joe Fernandez [Tue, 18 Aug 2015 00:00:04 +0000 (00:00 +0000)]
am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

* commit 'a215557b73b1edf8224609088b3c231b44a5fe6f':
  docs: M Preview 3 post-release cleanup

9 years agoam 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for...
Quddus Chong [Mon, 17 Aug 2015 23:54:34 +0000 (23:54 +0000)]
am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '0c61fe7606c8af2a89abebde0c174e88b950a8b8':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

9 years agoam 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 23:48:03 +0000 (23:48 +0000)]
am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

* commit '0805fcc311fa681e7a648a0da0e39fa7b1368c90':
  docs: M Preview 3 post-release cleanup

9 years agoam 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Rebloc...
Quddus Chong [Mon, 17 Aug 2015 23:48:02 +0000 (23:48 +0000)]
am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '7aa6fc67d7c1c02cd2e99e8d94b4c0b8918c4d3f':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

9 years agoam d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file...
Amit Mahajan [Mon, 17 Aug 2015 23:43:25 +0000 (23:43 +0000)]
am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

* commit 'd2a4165ada8d89d091f79b12b0f2ca80bd3eee22':
  Setting config_use_sim_language_file to false for 334-020.

9 years agoam 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 23:40:15 +0000 (23:40 +0000)]
am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

* commit '036895e1f18539d49496ea38592d0b1f9456efd1':
  docs: M Preview 3 post-release cleanup

9 years agoMerge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc...
Quddus Chong [Mon, 17 Aug 2015 23:38:56 +0000 (23:38 +0000)]
Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

9 years agoFix issue #23214751: Get a GPS fix before going in to doze
Dianne Hackborn [Fri, 14 Aug 2015 23:43:14 +0000 (16:43 -0700)]
Fix issue #23214751: Get a GPS fix before going in to doze

This introduces a new phase of device idle mode, immediately
before going idle (once we are sure the device is not moving),
try to collect a location for the device so that any later
requests for it will have a good chance of having an accurate
value.

We do this with two location requests: one a single-shot as
accurate as possible location, and a second longer-running
attempt to get an accurate location from the GPS.  There is
a limit on how long we will try to collect the location (default
is 30 seconds), and we stop collection once we reach a desired
accuracy (default is 20 meters).

Also cleanup various transition paths out of the normal state
flow to clean up any active state we may have running.

Change-Id: Ibd3d2e9a720fbfd9640755baf5547180dd409f6a

9 years agoMerge "docs: M Preview 3 post-release cleanup" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 23:30:07 +0000 (23:30 +0000)]
Merge "docs: M Preview 3 post-release cleanup" into mnc-dev

9 years agoam ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for...
Amit Mahajan [Mon, 17 Aug 2015 23:28:15 +0000 (23:28 +0000)]
am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

* commit 'ebadc46132248edd175b9ae3b7f6312b97b822fe':
  Setting config_use_sim_language_file to false for 334-020.

9 years agoam dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into...
Amit Mahajan [Mon, 17 Aug 2015 23:21:25 +0000 (23:21 +0000)]
am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

* commit 'dd8df0418ee4a873efd66ada577c5a2b21b3de5d':
  Setting config_use_sim_language_file to false for 334-020.

9 years agoMerge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
Amit Mahajan [Mon, 17 Aug 2015 23:06:13 +0000 (23:06 +0000)]
Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev

9 years agoam 514fa3c0: am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names...
Selim Cinek [Mon, 17 Aug 2015 23:00:12 +0000 (23:00 +0000)]
am 514fa3c0: am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev

* commit '514fa3c0273e4ad3ebc86c514cffea2b603fc6ad':
  Not allowing empty fingerprint names anymore

9 years agoam a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into...
Selim Cinek [Mon, 17 Aug 2015 22:50:17 +0000 (22:50 +0000)]
am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev

* commit 'a6aa1fbd2bda71e04f662a9a896b04e85ef36891':
  Not allowing empty fingerprint names anymore

9 years agoam d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
Selim Cinek [Mon, 17 Aug 2015 22:43:22 +0000 (22:43 +0000)]
am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev

* commit 'd4d61826d0499d77c0501bd150b5f7395c94fd13':
  Not allowing empty fingerprint names anymore

9 years agodocs: M Preview 3 post-release cleanup
Joe Fernandez [Mon, 17 Aug 2015 21:21:12 +0000 (14:21 -0700)]
docs: M Preview 3 post-release cleanup

- Add BTLE and Wi-Fi scan permissions change
- Add link to Support library v23 differences report
- Added known issue about Work Profiles not working in MPA44G images

Change-Id: Ica5643b1f9b6980520fd2650dcbab5d88d264127

9 years agoMerge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
Selim Cinek [Mon, 17 Aug 2015 22:34:40 +0000 (22:34 +0000)]
Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev

9 years agoam 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue...
Jorim Jaggi [Mon, 17 Aug 2015 22:20:21 +0000 (22:20 +0000)]
am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit '8787d8ef01205e8b16cc7fa98b9b95af326fcffc':
  Fix documentation issue

9 years agoam 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
Jorim Jaggi [Mon, 17 Aug 2015 22:13:12 +0000 (22:13 +0000)]
am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit '73ef464291953ea945014dfab22c84d147714a40':
  Fix documentation issue

9 years agoam 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
Jorim Jaggi [Mon, 17 Aug 2015 22:05:30 +0000 (22:05 +0000)]
am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
  Fix documentation issue

9 years agoam 757e2c7f: Merge "Fix documentation issue" into mnc-dev
Jorim Jaggi [Mon, 17 Aug 2015 21:58:51 +0000 (21:58 +0000)]
am 757e2c7f: Merge "Fix documentation issue" into mnc-dev

* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue

9 years agoMerge "Fix documentation issue" into mnc-dev
Jorim Jaggi [Mon, 17 Aug 2015 21:51:47 +0000 (21:51 +0000)]
Merge "Fix documentation issue" into mnc-dev

9 years agodocs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
Quddus Chong [Mon, 17 Aug 2015 21:24:35 +0000 (14:24 -0700)]
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

Change-Id: I872bbb5069418a4dfb174dda5dd9e86b833f7894

9 years agoam 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks...
Elliott Hughes [Mon, 17 Aug 2015 21:15:40 +0000 (21:15 +0000)]
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.

9 years agoam eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
Elliott Hughes [Mon, 17 Aug 2015 21:01:59 +0000 (21:01 +0000)]
am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

* commit 'eba23aaa765822c5ed8a152af00da1998d61409e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.

9 years agoam c75d4050: am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library...
Joe Fernandez [Mon, 17 Aug 2015 20:51:18 +0000 (20:51 +0000)]
am c75d4050: am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev

* commit 'c75d40500d4d25f4535f6b54390e3aa4a0ee8758':
  docs: Support Library v23 updates

9 years agoMerge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
Elliott Hughes [Mon, 17 Aug 2015 20:51:00 +0000 (20:51 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

9 years agoam 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates"...
Joe Fernandez [Mon, 17 Aug 2015 20:44:15 +0000 (20:44 +0000)]
am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev

* commit '811330ed182ab4827b2ad4c8a4944af0a4a8b18a':
  docs: Support Library v23 updates

9 years agoam 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 20:36:53 +0000 (20:36 +0000)]
am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev

* commit '1eb1f7cf9be8e7491d6e676c12ce1fccd31ee479':
  docs: Support Library v23 updates

9 years agoam 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 20:27:41 +0000 (20:27 +0000)]
am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev

* commit '46ae218b2aeab9e92d59b3d074cc43d696be11d5':
  docs: Support Library v23 updates

9 years agoMerge "docs: Support Library v23 updates" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 20:22:15 +0000 (20:22 +0000)]
Merge "docs: Support Library v23 updates" into mnc-dev

9 years agodocs: Support Library v23 updates
Rich Slogar [Thu, 6 Aug 2015 01:02:17 +0000 (18:02 -0700)]
docs: Support Library v23 updates

Change-Id: I0f5b6109d907e9bb29bd500eb852a031f8952287

9 years agoam a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
Dirk Dougherty [Mon, 17 Aug 2015 20:18:49 +0000 (20:18 +0000)]
am a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.

* commit 'a38d97ca8aac6c830fbbfd890560d8a971eebea1':
  Doc change: misc fixes for preview 3.

9 years agoam 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
Dirk Dougherty [Mon, 17 Aug 2015 20:11:02 +0000 (20:11 +0000)]
am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.

* commit '76342acf89cf19b42a3671ea48b2f0264c0ce484':
  Doc change: misc fixes for preview 3.

9 years agoam 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast...
Bryce Lee [Mon, 17 Aug 2015 20:08:19 +0000 (20:08 +0000)]
am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev

* commit '55d39ecb55052641db98566b5323c0af2b476990':
  Introduce permission for updating the cell broadcast content provider.

9 years agoam ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
Dirk Dougherty [Mon, 17 Aug 2015 20:03:59 +0000 (20:03 +0000)]
am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.

* commit 'ed257d1a3c7d94980e6fc1524a8e85f4e1d3959a':
  Doc change: misc fixes for preview 3.

9 years agoam d74a66bd: Merge "Introduce permission for updating the cell broadcast content...
Bryce Lee [Mon, 17 Aug 2015 20:01:51 +0000 (20:01 +0000)]
am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev

* commit 'd74a66bd97ed52fc985e9fa145072a9fc4e0a3e3':
  Introduce permission for updating the cell broadcast content provider.

9 years agoam bd58d6fc: Doc change: misc fixes for preview 3.
Dirk Dougherty [Mon, 17 Aug 2015 19:56:28 +0000 (19:56 +0000)]
am bd58d6fc: Doc change: misc fixes for preview 3.

* commit 'bd58d6fcadad111cee35778a4f77c4f789a0f8c6':
  Doc change: misc fixes for preview 3.

9 years agoMerge "Introduce permission for updating the cell broadcast content provider." into...
Bryce Lee [Mon, 17 Aug 2015 19:54:19 +0000 (19:54 +0000)]
Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev

9 years agoReplace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Elliott Hughes [Mon, 17 Aug 2015 19:41:46 +0000 (12:41 -0700)]
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.

Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a

9 years agoDoc change: misc fixes for preview 3.
Dirk Dougherty [Mon, 17 Aug 2015 13:50:29 +0000 (06:50 -0700)]
Doc change: misc fixes for preview 3.

Change-Id: Ib389f3db0e38f13d2634fda9e893c1dd87dcd6fc

9 years agoam 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisio...
Junda Liu [Mon, 17 Aug 2015 19:26:55 +0000 (19:26 +0000)]
am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit '9ddc014da24a74ea7ac6b2816521cb60e9059306':
  Grant SMS carrier provisioning app the permission to receive SMS.

9 years agoam 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app...
Junda Liu [Mon, 17 Aug 2015 19:20:10 +0000 (19:20 +0000)]
am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit '88c4e40636e2d2022b7afdacccb4de0d07d7703f':
  Grant SMS carrier provisioning app the permission to receive SMS.

9 years agoNot allowing empty fingerprint names anymore
Selim Cinek [Thu, 13 Aug 2015 23:17:13 +0000 (16:17 -0700)]
Not allowing empty fingerprint names anymore

Bug: 22497103
Change-Id: I638b1db5b614f5ea9bf8e3566bf4619a3249d391

9 years agoam 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permission...
Chris Tate [Mon, 17 Aug 2015 19:18:21 +0000 (19:18 +0000)]
am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit '498cf7ac937fda7e766fe96547a71f129f4cccb0':
  Check component permissions like 'exported' before assigned permissions

9 years agoClean up properly if outcall for doRestoreFinished() fails
Christopher Tate [Mon, 17 Aug 2015 19:16:19 +0000 (12:16 -0700)]
Clean up properly if outcall for doRestoreFinished() fails

The target app crashed at an inopportune time but this shouldn't
invalidate the whole ongoing restore operation; it's a problem local to
the specific app undergoing restore.  Recognize this, clean up the app's
possibly-incomplete data, and continue running the restore queue as
planned.

Bug 23228982

Change-Id: If9a19d2fe6a0ce5339c893630d7a61a5a5ccd9b1

9 years agoam 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag...
Quddus Chong [Mon, 17 Aug 2015 19:12:54 +0000 (19:12 +0000)]
am 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.

* commit '433ecac90389abd3c5762232c3d6f7c0a4c3d03c':
  docs: Fixed unclosed anchor tag for M Program Overview.

9 years agoam a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \...
Chris Tate [Mon, 17 Aug 2015 19:11:40 +0000 (19:11 +0000)]
am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit 'a0d4c9758c3dc06b29c61a2f023599a83aea8268':
  Check component permissions like 'exported' before assigned permissions

9 years agoam 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission...
Junda Liu [Mon, 17 Aug 2015 19:11:24 +0000 (19:11 +0000)]
am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit '150123a37445dc778c30a466b6a69f575007c76d':
  Grant SMS carrier provisioning app the permission to receive SMS.

9 years agoam f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive...
Junda Liu [Mon, 17 Aug 2015 19:03:58 +0000 (19:03 +0000)]
am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit 'f2cb6f7e3ea143ba4acace0821c9d49e363da7eb':
  Grant SMS carrier provisioning app the permission to receive SMS.

9 years agoam 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program...
Quddus Chong [Mon, 17 Aug 2015 19:03:51 +0000 (19:03 +0000)]
am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.

* commit '101059b723ff03684fff89898bd5b046af320a16':
  docs: Fixed unclosed anchor tag for M Program Overview.

9 years agoam 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before...
Chris Tate [Mon, 17 Aug 2015 19:01:52 +0000 (19:01 +0000)]
am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit '1a31af15c14ddc241e6e0633be337f81dea20ad5':
  Check component permissions like 'exported' before assigned permissions

9 years agoMerge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
Junda Liu [Mon, 17 Aug 2015 18:58:19 +0000 (18:58 +0000)]
Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

9 years agoam aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
Quddus Chong [Mon, 17 Aug 2015 18:56:40 +0000 (18:56 +0000)]
am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.

* commit 'aefae50d5e4d81601d52dce47e9be6e56834ccf3':
  docs: Fixed unclosed anchor tag for M Program Overview.

9 years agoam a3fd27ad: Merge "Check component permissions like \'exported\' before assigned...
Chris Tate [Mon, 17 Aug 2015 18:55:24 +0000 (18:55 +0000)]
am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit 'a3fd27adcc655dd9566d72f290ac343704e8e4db':
  Check component permissions like 'exported' before assigned permissions

9 years agoam 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge...
Andrew Solovay [Mon, 17 Aug 2015 18:55:04 +0000 (18:55 +0000)]
am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit '8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb':
  docs: Updating the permissions docs for Preview 3.

9 years agoam a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
Quddus Chong [Mon, 17 Aug 2015 18:47:52 +0000 (18:47 +0000)]
am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.

* commit 'a03567bfe0b2f71263e5facd0edc908bf43965cc':
  docs: Fixed unclosed anchor tag for M Program Overview.

9 years agoFix documentation issue
Jorim Jaggi [Mon, 17 Aug 2015 18:41:51 +0000 (11:41 -0700)]
Fix documentation issue

Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1

9 years agoMerge "Check component permissions like 'exported' before assigned permissions" into...
Chris Tate [Mon, 17 Aug 2015 18:01:15 +0000 (18:01 +0000)]
Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev

9 years agoam f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to...
Andrew Solovay [Mon, 17 Aug 2015 17:54:30 +0000 (17:54 +0000)]
am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'f377bffb30c78aaa5dd4188400a018a9febc2afd':
  docs: Updating the permissions docs for Preview 3.

9 years agodocs: Fixed unclosed anchor tag for M Program Overview.
Quddus Chong [Mon, 17 Aug 2015 17:42:34 +0000 (10:42 -0700)]
docs: Fixed unclosed anchor tag for M Program Overview.

Change-Id: I632e999c0d32acbf5c5fce5377603069fea312f0

9 years agoam 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare...
Ruben Brunk [Mon, 17 Aug 2015 17:51:42 +0000 (17:51 +0000)]
am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev

* commit '305680d6a08f6b44d71d7c83aebc557cfcbd3f85':
  Add experimental camera session prepare API.

9 years agoam a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
Andrew Solovay [Mon, 17 Aug 2015 17:45:46 +0000 (17:45 +0000)]
am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'a8f68d2da7733673d25fd1e5573539bf29b71ee4':
  docs: Updating the permissions docs for Preview 3.

9 years agoam 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into...
Ruben Brunk [Mon, 17 Aug 2015 17:44:36 +0000 (17:44 +0000)]
am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev

* commit '3723af531a2e5d9e90097460167d98cf8fc9975f':
  Add experimental camera session prepare API.

9 years agoam c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
Ruben Brunk [Mon, 17 Aug 2015 17:37:16 +0000 (17:37 +0000)]
am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev

* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
  Add experimental camera session prepare API.

9 years agoam af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
Andrew Solovay [Mon, 17 Aug 2015 17:35:05 +0000 (17:35 +0000)]
am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
  docs: Updating the permissions docs for Preview 3.

9 years agoMerge "Add experimental camera session prepare API." into mnc-dr-dev
Ruben Brunk [Mon, 17 Aug 2015 17:28:12 +0000 (17:28 +0000)]
Merge "Add experimental camera session prepare API." into mnc-dr-dev

9 years agoCheck component permissions like 'exported' before assigned permissions
Christopher Tate [Mon, 17 Aug 2015 17:23:22 +0000 (10:23 -0700)]
Check component permissions like 'exported' before assigned permissions

In particular, don't assume that the absence of an explicit permission
requirement means that the activity is freely launchable unless you have
also checked thing like exported="true" first.

Bug 23223804

Change-Id: Idbfd1f5662b374a7a447b738591b267a1c497e41

9 years agoam 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into...
Chris Wren [Mon, 17 Aug 2015 17:09:52 +0000 (17:09 +0000)]
am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev

* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
  instrument fingerprint service

9 years agoresolved conflicts for merge of 44053b4e to mnc-dev
Andrew Solovay [Mon, 17 Aug 2015 17:06:26 +0000 (10:06 -0700)]
resolved conflicts for merge of 44053b4e to mnc-dev

Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf

9 years agoam 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 17:02:03 +0000 (17:02 +0000)]
am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev

* commit '2299478362bfb5c0608dad083371b404124d9c89':
  instrument fingerprint service

9 years agoam 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:52:29 +0000 (16:52 +0000)]
am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev

* commit '877c22579e18736ee77d106ee2419ae99203bc9b':
  instrument fingerprint service

9 years agoMerge "instrument fingerprint service" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:47:55 +0000 (16:47 +0000)]
Merge "instrument fingerprint service" into mnc-dr-dev

9 years agoam 8f00f747: am 3449530c: am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Androi...
Quddus Chong [Mon, 17 Aug 2015 16:24:11 +0000 (16:24 +0000)]
am 8f00f747: am 3449530c: am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev

* commit '8f00f7472744837b838368ab6eda050683b64f71':
  docs: Fixed typo in Android for Work section in MNC Behavior Changes doc.