OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation
Jorim Jaggi [Wed, 19 Aug 2015 01:32:06 +0000 (01:32 +0000)]
am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation

* commit '2591d6ffc60505df0099069877f7913ec30e4460':
  Do not start with a black frame in bootanimation

8 years agoam e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
Jim Miller [Wed, 19 Aug 2015 01:31:58 +0000 (01:31 +0000)]
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
  Revert "Disable fingerprint when remotely reset by DPM"

8 years agoam 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
Tim Kilbourn [Wed, 19 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev

* commit '9b1fd822d07a5e3c270b76b197bec7ebfadb250d':
  Use init to write usb typec props.

8 years agoam 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED...
Roozbeh Pournader [Wed, 19 Aug 2015 01:31:43 +0000 (01:31 +0000)]
am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '31a536e117ff750b49350d5dc7268239bfc2ff36':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoam 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService...
Dianne Hackborn [Wed, 19 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '8100b3fa8be63b5c3525997b35d216edfc0cd7e7':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoam 358fcc79: Do not start with a black frame in bootanimation
Jorim Jaggi [Tue, 18 Aug 2015 20:33:08 +0000 (20:33 +0000)]
am 358fcc79: Do not start with a black frame in bootanimation

* commit '358fcc795ea567ba086a460c587de427507fefdd':
  Do not start with a black frame in bootanimation

8 years agoDo not start with a black frame in bootanimation
Jorim Jaggi [Wed, 12 Aug 2015 03:23:56 +0000 (20:23 -0700)]
Do not start with a black frame in bootanimation

Bug: 23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f

8 years agoam 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
Jim Miller [Tue, 18 Aug 2015 20:15:10 +0000 (20:15 +0000)]
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

* commit '33a5c80773b7b2913c92fec170787499a453d184':
  Revert "Disable fingerprint when remotely reset by DPM"

8 years agoresolved conflicts for merge of 448216e7 to mnc-dr-dev
Jim Miller [Tue, 18 Aug 2015 20:07:25 +0000 (13:07 -0700)]
resolved conflicts for merge of 448216e7 to mnc-dr-dev

Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5

8 years agoam 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
Tim Kilbourn [Tue, 18 Aug 2015 20:02:47 +0000 (20:02 +0000)]
am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev

* commit '2ad94499697d79dc41489ab873527411f88b3f15':
  Use init to write usb typec props.

8 years agoMerge "Use init to write usb typec props." into mnc-dr-dev
Tim Kilbourn [Tue, 18 Aug 2015 19:54:46 +0000 (19:54 +0000)]
Merge "Use init to write usb typec props." into mnc-dr-dev

8 years agoam 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket...
Roozbeh Pournader [Tue, 18 Aug 2015 19:44:49 +0000 (19:44 +0000)]
am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '579283647e110538651fa812ceb15bc7f44e50a8':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoam 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks...
Roozbeh Pournader [Tue, 18 Aug 2015 19:37:16 +0000 (19:37 +0000)]
am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '53c38c8819e2497f8272e7615d34aaa4ae052adf':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoMerge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
Jim Miller [Tue, 18 Aug 2015 19:32:01 +0000 (19:32 +0000)]
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev

8 years agoMerge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
Roozbeh Pournader [Tue, 18 Aug 2015 19:29:47 +0000 (19:29 +0000)]
Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

8 years agoRevert "Create a special CONSTRAINED font bucket in frameworks."
Roozbeh Pournader [Tue, 18 Aug 2015 19:17:13 +0000 (12:17 -0700)]
Revert "Create a special CONSTRAINED font bucket in frameworks."

This reverts commit 9e21eced5efacd605036be599d96974964deb09b.

Bug: 22929087

8 years agoam 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running...
Dianne Hackborn [Tue, 18 Aug 2015 18:41:51 +0000 (18:41 +0000)]
am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '4439dcdc395a9c173df1ddcf64c510eed5face07':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoam af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManageme...
Dianne Hackborn [Tue, 18 Aug 2015 18:33:25 +0000 (18:33 +0000)]
am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoFix issue #23270878: NPE in UsageStatsService while running UserManagementTest
Dianne Hackborn [Tue, 18 Aug 2015 18:08:10 +0000 (11:08 -0700)]
Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a

8 years agoam 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked...
Sebastien Hertz [Tue, 18 Aug 2015 08:04:41 +0000 (08:04 +0000)]
am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '677cd0872013cdeb4c201ce0994633065b616725':
  Allow debugging only for apps forked from zygote

8 years agoam e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote...
Sebastien Hertz [Tue, 18 Aug 2015 07:56:37 +0000 (07:56 +0000)]
am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit 'e9de1b4cef10922180cfe06049cf906160e2c315':
  Allow debugging only for apps forked from zygote

8 years agoam 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
Sebastien Hertz [Tue, 18 Aug 2015 07:50:06 +0000 (07:50 +0000)]
am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote

8 years agoMerge "Allow debugging only for apps forked from zygote" into mnc-dev
Sebastien Hertz [Tue, 18 Aug 2015 07:41:50 +0000 (07:41 +0000)]
Merge "Allow debugging only for apps forked from zygote" into mnc-dev

8 years agoam 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview...
Joe Fernandez [Tue, 18 Aug 2015 07:41:22 +0000 (07:41 +0000)]
am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '20a9ca1581c266ce320ea850ee6dc10719584ebf':
  docs: App link doc update for M Preview 3

8 years agoam d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into...
Joe Fernandez [Tue, 18 Aug 2015 07:36:25 +0000 (07:36 +0000)]
am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit 'd294dc437d53ceb74529e62aa70078a8f51bb462':
  docs: App link doc update for M Preview 3

8 years agoam 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
Joe Fernandez [Tue, 18 Aug 2015 07:28:31 +0000 (07:28 +0000)]
am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
  docs: App link doc update for M Preview 3

8 years agoMerge "docs: App link doc update for M Preview 3" into mnc-dev
Joe Fernandez [Tue, 18 Aug 2015 07:23:35 +0000 (07:23 +0000)]
Merge "docs: App link doc update for M Preview 3" into mnc-dev

8 years agodocs: App link doc update for M Preview 3
Joe Fernandez [Fri, 14 Aug 2015 10:00:27 +0000 (03:00 -0700)]
docs: App link doc update for M Preview 3

Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947

8 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

8 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

8 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

8 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

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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

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

8 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

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

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

8 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

8 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

8 years agoRevert "Disable fingerprint when remotely reset by DPM"
Jim Miller [Mon, 17 Aug 2015 23:30:35 +0000 (23:30 +0000)]
Revert "Disable fingerprint when remotely reset by DPM"

This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f.

Fixes bug 23187090

Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2

8 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

8 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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

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

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

8 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

8 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

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

8 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

8 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

8 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

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

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

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

8 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

8 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

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

8 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

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

8 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

8 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

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

8 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

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

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

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

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