Chris Tate
45f88e1b2c
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
2015-08-18 01:36:05 +00:00
Dianne Hackborn
5211c0630b
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
2015-08-18 01:35:14 +00:00
Chris Tate
591b371fbb
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
2015-08-18 01:28:13 +00:00
Dianne Hackborn
6da89844d4
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
2015-08-18 01:26:10 +00:00
Chris Tate
ccbb02f9b9
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
2015-08-18 01:21:05 +00:00
Dianne Hackborn
12b9c2d6aa
Merge "Fix issue #23214751 : Get a GPS fix before going in to doze" into mnc-dev
2015-08-18 01:17:00 +00:00
Chris Tate
b16cd62c67
am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
...
* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
Clean up properly if outcall for doRestoreFinished() fails
2015-08-18 01:13:24 +00:00
Chris Tate
c0a2254e08
Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
2015-08-18 01:07:50 +00:00
Filip Gruszczynski
3fcb5d66e4
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
2015-08-17 17:52:24 -07:00
Quddus Chong
267ed78aad
am 96395fad: 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 '96395fad84a7f6dba2124a1d68e5c63cb4e0e1de':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-18 00:24:39 +00:00
Joe Fernandez
b34086aab7
am 91b44d93: am 33c9093e: am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit '91b44d933371037a7d7c607797bb12b5f00b9fcc':
docs: M Preview 3 post-release cleanup
2015-08-18 00:16:46 +00:00
Quddus Chong
96395fad84
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.
2015-08-18 00:15:33 +00:00
Amit Mahajan
89967e2eb4
am 6afd2641: am 13bf77ed: am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
...
* commit '6afd26412701dc510439d1d67f0843ce6ba4cea5':
Setting config_use_sim_language_file to false for 334-020.
2015-08-18 00:11:34 +00:00
Joe Fernandez
91b44d9333
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
2015-08-18 00:08:28 +00:00
Quddus Chong
338b05560d
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.
2015-08-18 00:06:52 +00:00
Amit Mahajan
6afd264127
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.
2015-08-18 00:02:03 +00:00
Joe Fernandez
33c9093e13
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
2015-08-18 00:00:04 +00:00
Quddus Chong
905af2b462
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.
2015-08-17 23:54:34 +00:00
Joe Fernandez
a215557b73
am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit '0805fcc311fa681e7a648a0da0e39fa7b1368c90':
docs: M Preview 3 post-release cleanup
2015-08-17 23:48:03 +00:00
Quddus Chong
0c61fe7606
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.
2015-08-17 23:48:02 +00:00
Amit Mahajan
13bf77ed0a
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.
2015-08-17 23:43:25 +00:00
Joe Fernandez
0805fcc311
am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
...
* commit '036895e1f18539d49496ea38592d0b1f9456efd1':
docs: M Preview 3 post-release cleanup
2015-08-17 23:40:15 +00:00
Fyodor Kupolov
fe11a9f714
Merge "Make notification content clickable for logout/remove guest"
2015-08-17 23:40:06 +00:00
Quddus Chong
7aa6fc67d7
Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
2015-08-17 23:38:56 +00:00
Fyodor Kupolov
52408f4fb5
Make notification content clickable for logout/remove guest
...
Pressing notification content for logout/remove guest notification, should
trigger the same action as the button below.
Change-Id: I70294b6855e47a67ace71b8232ffc9b320ef8333
2015-08-17 16:35:08 -07:00
Jim Miller
deb050706c
Revert "Disable fingerprint when remotely reset by DPM"
...
This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f.
Fixes bug 23187090
Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
2015-08-17 23:33:39 +00:00
Dianne Hackborn
42df4fbe10
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
2015-08-17 16:32:54 -07:00
Joe Fernandez
036895e1f1
Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
2015-08-17 23:30:07 +00:00
Amit Mahajan
d2a4165ada
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.
2015-08-17 23:28:15 +00:00
Amit Mahajan
ebadc46132
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.
2015-08-17 23:21:25 +00:00
Selim Cinek
30fedf4028
am efdb9f7b: am 514fa3c0: am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
...
* commit 'efdb9f7be8c5303cb55e75006f82c466301b1354':
Not allowing empty fingerprint names anymore
2015-08-17 23:10:56 +00:00
Amit Mahajan
dd8df0418e
Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
2015-08-17 23:06:13 +00:00
Selim Cinek
efdb9f7be8
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
2015-08-17 23:00:12 +00:00
Selim Cinek
514fa3c027
am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
...
* commit 'a6aa1fbd2bda71e04f662a9a896b04e85ef36891':
Not allowing empty fingerprint names anymore
2015-08-17 22:50:17 +00:00
Selim Cinek
a6aa1fbd2b
am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
...
* commit 'd4d61826d0499d77c0501bd150b5f7395c94fd13':
Not allowing empty fingerprint names anymore
2015-08-17 22:43:22 +00:00
John Reck
2fce18d99d
Merge "Revert "Add ninePatch support to Canvas.h""
2015-08-17 22:39:57 +00:00
Joe Fernandez
c45bd6930b
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
2015-08-17 15:39:35 -07:00
Selim Cinek
d4d61826d0
Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
2015-08-17 22:34:40 +00:00
Jorim Jaggi
69ca9960ac
am faca9cbb: am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
...
* commit 'faca9cbbffb84683fa0f11ba14ae907ea872e6ce':
Fix documentation issue
2015-08-17 22:27:34 +00:00
John Reck
773bbe0357
Revert "Add ninePatch support to Canvas.h"
...
This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454.
Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
2015-08-17 15:24:09 -07:00
Jorim Jaggi
faca9cbbff
am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
...
* commit '8787d8ef01205e8b16cc7fa98b9b95af326fcffc':
Fix documentation issue
2015-08-17 22:20:21 +00:00
Jorim Jaggi
8787d8ef01
am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
...
* commit '73ef464291953ea945014dfab22c84d147714a40':
Fix documentation issue
2015-08-17 22:13:12 +00:00
Jorim Jaggi
73ef464291
am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
...
* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
Fix documentation issue
2015-08-17 22:05:30 +00:00
Jorim Jaggi
581fd0fb2e
am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
...
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
Fix documentation issue
2015-08-17 21:58:51 +00:00
Jorim Jaggi
757e2c7f3e
Merge "Fix documentation issue" into mnc-dev
2015-08-17 21:51:47 +00:00
Yohei Yukawa
9dffc27b60
Merge "Clear SuggestionsPopupWindow.mSpansLengths after it is used."
2015-08-17 21:44:24 +00:00
Seigo Nonaka
c8e6c7996f
Merge "Remove duplicate separator definition."
2015-08-17 21:33:30 +00:00
Quddus Chong
db87d7cd9e
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
...
Change-Id: I872bbb5069418a4dfb174dda5dd9e86b833f7894
2015-08-17 14:28:32 -07:00
Elliott Hughes
7934a41bfb
am 84d4917c: am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
...
* commit '84d4917c7560da364eb8fe79353e046807beb416':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
2015-08-17 21:27:41 +00:00
Elliott Hughes
84d4917c75
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.
2015-08-17 21:15:40 +00:00