OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position...
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:56:24 +0000 (21:56 +0000)]
am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit 'd49c3b65311aad1f70ed9194d46a4bca302fe89e':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certa...
Robert Greenwalt [Mon, 20 Jul 2015 21:56:17 +0000 (21:56 +0000)]
am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '30cf80792165d88e9844b5867e9f598f2f64f0df':
  Support optional modem restart on certain errors.

9 years agoam 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract...
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:38:29 +0000 (21:38 +0000)]
am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '00eb57678d8e6aa152ffbbf4b43f41c3287e480e':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors...
Robert Greenwalt [Mon, 20 Jul 2015 21:38:23 +0000 (21:38 +0000)]
am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'dacf0443d57c11c8b7021f591a20519e53dd3b9e':
  Support optional modem restart on certain errors.

9 years agoam eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 21:32:27 +0000 (21:32 +0000)]
am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit 'eeeb45a76d477c4c1f8590775de83e30a67501d9':
  Fix hotspot brokenness

9 years agoam c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManag...
Jae Seo [Mon, 20 Jul 2015 21:32:21 +0000 (21:32 +0000)]
am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'c160c231ab2945a194cd7dbad31837ee49904234':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing instal...
Jeff Sharkey [Mon, 20 Jul 2015 21:32:15 +0000 (21:32 +0000)]
am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'f811d7fc0ff03a9fa70fb46525342127c7435ef5':
  Inherit ABI when moving existing install.

9 years agoam 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:23:43 +0000 (21:23 +0000)]
am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '437eb6ce483a34e28c06d70c0b408ba4a495293a':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev
Robert Greenwalt [Mon, 20 Jul 2015 21:23:38 +0000 (21:23 +0000)]
am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'b0e4a9e8a4367cbc3c7f08f7f95cfa0c9397fdaf':
  Support optional modem restart on certain errors.

9 years agoam e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short...
Roozbeh Pournader [Mon, 20 Jul 2015 21:18:32 +0000 (21:18 +0000)]
am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit 'e043a74bd0598ba2abb68d94d6d8a1f7ea5a2ccb':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 21:17:37 +0000 (21:17 +0000)]
am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '47b9d250220f7eaaef7465367fd6ff0d2c86f4e1':
  Fix hotspot brokenness

9 years agoam 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamV...
Jae Seo [Mon, 20 Jul 2015 21:17:32 +0000 (21:17 +0000)]
am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit '48d707ae07df8b03585fc00880e61ebf7cdb6a5b':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into...
Jeff Sharkey [Mon, 20 Jul 2015 21:17:28 +0000 (21:17 +0000)]
am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'fe7a311c421473f1b50dcd2751585f89664a4327':
  Inherit ABI when moving existing install.

9 years agoMerge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:12:36 +0000 (21:12 +0000)]
Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

9 years agoMerge "Support optional modem restart on certain errors." into mnc-dev
Robert Greenwalt [Mon, 20 Jul 2015 21:10:39 +0000 (21:10 +0000)]
Merge "Support optional modem restart on certain errors." into mnc-dev

9 years agoam 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize(...
Roozbeh Pournader [Mon, 20 Jul 2015 20:56:57 +0000 (20:56 +0000)]
am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '91bb9d0a8489068c88d9d2496d9e806cf4094df3':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:55:19 +0000 (20:55 +0000)]
am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '33c619bb52c9e3e62b7243c9b1d9a75189885427':
  Fix hotspot brokenness

9 years agoam 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into...
Jae Seo [Mon, 20 Jul 2015 20:55:14 +0000 (20:55 +0000)]
am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit '26f7720ed0d6a0894772d82b7ebed03ac686c6f3':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:55:09 +0000 (20:55 +0000)]
am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit '35ba2cdbf8654d708e57d209131dd498705d0e18':
  Inherit ABI when moving existing install.

9 years agoMerge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:47:15 +0000 (20:47 +0000)]
Merge "Fix hotspot brokenness" into mnc-dev

9 years agoMerge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
Jae Seo [Mon, 20 Jul 2015 20:45:07 +0000 (20:45 +0000)]
Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

9 years agoMerge "Inherit ABI when moving existing install." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:44:53 +0000 (20:44 +0000)]
Merge "Inherit ABI when moving existing install." into mnc-dev

9 years agoInherit ABI when moving existing install.
Jeff Sharkey [Mon, 20 Jul 2015 20:40:18 +0000 (13:40 -0700)]
Inherit ABI when moving existing install.

Previously installed apps are moved between volumes as an complete
package, including any previously unpacked native libraries.  This
means we need to inherit any previously derived ABI when moving.

Bug: 22093837
Change-Id: I7656e338affa44e7f997fe4aa95bb297c0acc165

9 years agoam 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
Roozbeh Pournader [Mon, 20 Jul 2015 20:40:10 +0000 (20:40 +0000)]
am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoMerge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
Roozbeh Pournader [Mon, 20 Jul 2015 20:30:37 +0000 (20:30 +0000)]
Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

9 years agoam 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import...
Geoff Mendal [Mon, 20 Jul 2015 20:29:32 +0000 (20:29 +0000)]
am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5038b92e6adae454feb6095092bdaff80ecf1db3':
  Import translations. DO NOT MERGE

9 years agoam 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should...
Dianne Hackborn [Mon, 20 Jul 2015 20:29:26 +0000 (20:29 +0000)]
am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '5cdc7f045f8714f5a9fd00402de5b12d84bba99d':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoam 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 20:29:20 +0000 (20:29 +0000)]
am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

* commit '44c44a2b6ae1d9b7088d0846f6ae49dc61ebb0ea':
  Import translations. DO NOT MERGE

9 years agoam 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window...
Wale Ogunwale [Mon, 20 Jul 2015 20:29:13 +0000 (20:29 +0000)]
am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '7e640edeb3c501ee851e70aa633aa531a6f0b34d':
  Fixed issue with background user window consuming touch events

9 years agoam f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 20:29:07 +0000 (20:29 +0000)]
am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit 'f2fd5002627cd92d5e10d2fd6496c80e8864edb3':
  Fix for MidiManager bug

9 years agoam ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 20 Jul 2015 20:12:55 +0000 (20:12 +0000)]
am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ddb33d7d879159471cee10bf471a6815e76ac376':
  Import translations. DO NOT MERGE

9 years agoam 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare...
Dianne Hackborn [Mon, 20 Jul 2015 20:12:48 +0000 (20:12 +0000)]
am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '3aefa438300b116d2c080de434e0a890bf1dded5':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoam ca49ae5a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 20:12:43 +0000 (20:12 +0000)]
am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

* commit 'ca49ae5a5e851a1f5c761261bdd544174e095c0e':
  Import translations. DO NOT MERGE

9 years agoam 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming...
Wale Ogunwale [Mon, 20 Jul 2015 20:12:38 +0000 (20:12 +0000)]
am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '81696d13360a00dd3a450e7ff97329e8560c4684':
  Fixed issue with background user window consuming touch events

9 years agoam a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 20:02:37 +0000 (20:02 +0000)]
am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a6bf393dc5b022f11c698dda610e209b5090d8c0':
  Import translations. DO NOT MERGE

9 years agoam 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disab...
Dianne Hackborn [Mon, 20 Jul 2015 20:02:32 +0000 (20:02 +0000)]
am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 19:58:35 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 19:53:55 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I08703b57a1fe0b578bcb7e5f2a2e7d9c2904526f
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: I41156105dcb753a1d9338cdbacebe03d2b4b4f1d
Auto-generated-cl: translation import

9 years agoMerge "Fix issue #22531747: Assist info should declare if user has disabled..." into...
Dianne Hackborn [Mon, 20 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

9 years agoFix issue #22531747: Assist info should declare if user has disabled...
Dianne Hackborn [Sat, 18 Jul 2015 01:04:14 +0000 (18:04 -0700)]
Fix issue #22531747: Assist info should declare if user has disabled...

...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b

9 years agoam e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can...
Billy Lau [Mon, 20 Jul 2015 19:11:22 +0000 (19:11 +0000)]
am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit 'e4bcf4803b41cf7e370d5f1d0c7ef1edf48ea267':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure...
Jeff Sharkey [Mon, 20 Jul 2015 19:11:17 +0000 (19:11 +0000)]
am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit 'f14e4435e02c1cf058d475a389abae3000562190':
  Better logging of MediaPlayer failure reason.

9 years agoam 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send...
Jean-Michel Trivi [Mon, 20 Jul 2015 19:11:10 +0000 (19:11 +0000)]
am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '34e75a9bbaa9bb4c79cc31034ba353ace659aaa8':
  Media button intent should be send to current user only.

9 years agoam 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 19:11:07 +0000 (19:11 +0000)]
am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '238f03c9b38182c2e4347ece097b4cb18ba926ab':
  Fix for MidiManager bug

9 years agoam bde85f74: Merge "Fixed issue with background user window consuming touch events...
Wale Ogunwale [Mon, 20 Jul 2015 19:11:06 +0000 (19:11 +0000)]
am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit 'bde85f741c2ccbb7d719cdf0a48a607b104c3943':
  Fixed issue with background user window consuming touch events

9 years agoam 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 18:47:21 +0000 (18:47 +0000)]
am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug

9 years agoMerge "Fixed issue with background user window consuming touch events" into mnc-dev
Wale Ogunwale [Mon, 20 Jul 2015 18:45:58 +0000 (18:45 +0000)]
Merge "Fixed issue with background user window consuming touch events" into mnc-dev

9 years agoam 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification...
Christopher Tate [Mon, 20 Jul 2015 18:44:44 +0000 (18:44 +0000)]
am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '9606921b766435a93e5e992ae061d8983ade8085':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoam dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SET...
Billy Lau [Mon, 20 Jul 2015 18:43:56 +0000 (18:43 +0000)]
am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit 'dd0602e89daf6c458674efbcf01a5e0521f3c381':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into...
Jeff Sharkey [Mon, 20 Jul 2015 18:43:51 +0000 (18:43 +0000)]
am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '0fa2a56c3bc88cd4f3cddee99528c7e8a57af4d6':
  Better logging of MediaPlayer failure reason.

9 years agoam c1aaeead: am 698250fa: Merge "Media button intent should be send to current user...
Jean-Michel Trivi [Mon, 20 Jul 2015 18:43:47 +0000 (18:43 +0000)]
am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit 'c1aaeead6ed7bb685c7bd0b5e09de935913229ed':
  Media button intent should be send to current user only.

9 years agoam 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or...
Billy Lau [Mon, 20 Jul 2015 18:04:08 +0000 (18:04 +0000)]
am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 18:04:04 +0000 (18:04 +0000)]
am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '71780e79846d0ccc2aef2214041657410a8a14c2':
  Better logging of MediaPlayer failure reason.

9 years agoam 698250fa: Merge "Media button intent should be send to current user only." into...
Jean-Michel Trivi [Mon, 20 Jul 2015 18:04:01 +0000 (18:04 +0000)]
am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '698250fae7d82d8020d2b9038b9e9d68c9489b04':
  Media button intent should be send to current user only.

9 years agoam 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when...
Christopher Tate [Mon, 20 Jul 2015 18:03:55 +0000 (18:03 +0000)]
am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '0fc1e88c05e805324880a35b3f10126937824a79':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoMerge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 18:03:41 +0000 (18:03 +0000)]
Merge "Fix for MidiManager bug" into mnc-dev

9 years agoMerge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WIND...
Billy Lau [Mon, 20 Jul 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

9 years agoMerge "Better logging of MediaPlayer failure reason." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Better logging of MediaPlayer failure reason." into mnc-dev

9 years agoBug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
Billy Lau [Mon, 20 Jul 2015 16:34:09 +0000 (17:34 +0100)]
Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb

9 years agoam 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up...
Christopher Tate [Mon, 20 Jul 2015 17:27:56 +0000 (17:27 +0000)]
am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '6afdad7e8863cb1fa3db5909e48269606fa76991':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoMerge "Media button intent should be send to current user only." into mnc-dev
Jean-Michel Trivi [Mon, 20 Jul 2015 17:25:27 +0000 (17:25 +0000)]
Merge "Media button intent should be send to current user only." into mnc-dev

9 years agoMerge "Don't fall back to domain verification state when looking up app linkage state...
Christopher Tate [Mon, 20 Jul 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev

9 years agoBetter logging of MediaPlayer failure reason.
Jeff Sharkey [Mon, 20 Jul 2015 16:38:02 +0000 (09:38 -0700)]
Better logging of MediaPlayer failure reason.

Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01

9 years agoFix hotspot brokenness
Jason Monk [Mon, 20 Jul 2015 16:18:38 +0000 (12:18 -0400)]
Fix hotspot brokenness

 - Only get state from broadcast to not get out of sync with Settings
 - Actually set the state when there isn't a boolean in the refresh
   object
 - Remove unused things

Bug: 22573156
Change-Id: Ibfb4966c99ba85f83701695c38275ba217854b22

9 years agoam 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 20 Jul 2015 16:20:59 +0000 (16:20 +0000)]
am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '753dc061075c3cd73af1bad508355c132944c694':
  Import translations. DO NOT MERGE

9 years agoam 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 16:06:38 +0000 (16:06 +0000)]
am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 15:58:50 +0000 (15:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 15:47:33 +0000 (10:47 -0500)]
Import translations. DO NOT MERGE

Change-Id: Ib98726d7c1b13a15d59e90a4e51b79542b0ff418
Auto-generated-cl: translation import

9 years agoam f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 20 Jul 2015 14:46:00 +0000 (14:46 +0000)]
am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'f3d1f3af76521e5d1c036016551c271c3112b8aa':
  Import translations. DO NOT MERGE

9 years agoam 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:45:55 +0000 (14:45 +0000)]
am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE

* commit '7b2319d016ecc32ca42819a0f6caa62a9681d137':
  Import translations. DO NOT MERGE

9 years agoam 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 14:32:47 +0000 (14:32 +0000)]
am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '5cc92074091ad5223380bf65e22ad054e9f2211f':
  Import translations. DO NOT MERGE

9 years agoam c0fa470d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)]
am c0fa470d: (-s ours) Import translations. DO NOT MERGE

* commit 'c0fa470da08460dc749e24107c904f47e3ee0d94':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 14:26:39 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 13:54:33 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I63f59410a8081aaf9678e9d318ba308c259e1254
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 13:52:40 +0000 (06:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import

9 years agoam ec69003d: am 9d598e11: Pass signal strength thresholds inside a Bundle
Erik Kline [Sat, 18 Jul 2015 17:54:49 +0000 (17:54 +0000)]
am ec69003d: am 9d598e11: Pass signal strength thresholds inside a Bundle

* commit 'ec69003d9b7e22f57b6168796fd5510f26b32986':
  Pass signal strength thresholds inside a Bundle

9 years agoam da355c80: am c3f21f3b: Support NetworkCallbacks based on signal strength.
Lorenzo Colitti [Sat, 18 Jul 2015 17:54:42 +0000 (17:54 +0000)]
am da355c80: am c3f21f3b: Support NetworkCallbacks based on signal strength.

* commit 'da355c80b04ec4e606a00ac5f1dfae74dabb36db':
  Support NetworkCallbacks based on signal strength.

9 years agoam 9d598e11: Pass signal strength thresholds inside a Bundle
Erik Kline [Sat, 18 Jul 2015 17:41:11 +0000 (17:41 +0000)]
am 9d598e11: Pass signal strength thresholds inside a Bundle

* commit '9d598e115f306e4f0860638c5647a959ac1320c5':
  Pass signal strength thresholds inside a Bundle

9 years agoam c3f21f3b: Support NetworkCallbacks based on signal strength.
Lorenzo Colitti [Sat, 18 Jul 2015 17:41:07 +0000 (17:41 +0000)]
am c3f21f3b: Support NetworkCallbacks based on signal strength.

* commit 'c3f21f3b8b01508f5dc01b2e5fa4c3d652bb67bb':
  Support NetworkCallbacks based on signal strength.

9 years agoam e647d93d: am 8bf977d5: ConnectivityManager API for for packet keepalives.
Lorenzo Colitti [Sat, 18 Jul 2015 17:33:38 +0000 (17:33 +0000)]
am e647d93d: am 8bf977d5: ConnectivityManager API for for packet keepalives.

* commit 'e647d93d6d3971423e3ef23a7ac6095e5c6c0586':
  ConnectivityManager API for for packet keepalives.

9 years agoam 00365fc6: am 260a36d1: Make immutable NetworkCapabilities more explicit.
Lorenzo Colitti [Sat, 18 Jul 2015 17:33:32 +0000 (17:33 +0000)]
am 00365fc6: am 260a36d1: Make immutable NetworkCapabilities more explicit.

* commit '00365fc62e9a0a266b5998d9e1002d79acc6c5f9':
  Make immutable NetworkCapabilities more explicit.

9 years agoPass signal strength thresholds inside a Bundle
Erik Kline [Mon, 13 Jul 2015 07:37:51 +0000 (16:37 +0900)]
Pass signal strength thresholds inside a Bundle

Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f

9 years agoSupport NetworkCallbacks based on signal strength.
Lorenzo Colitti [Mon, 6 Jul 2015 14:50:27 +0000 (23:50 +0900)]
Support NetworkCallbacks based on signal strength.

Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9

9 years agoam 8bf977d5: ConnectivityManager API for for packet keepalives.
Lorenzo Colitti [Sat, 18 Jul 2015 17:24:05 +0000 (17:24 +0000)]
am 8bf977d5: ConnectivityManager API for for packet keepalives.

* commit '8bf977d562b8f7261cf964bdf045b22bdbd92b7d':
  ConnectivityManager API for for packet keepalives.

9 years agoam 260a36d1: Make immutable NetworkCapabilities more explicit.
Lorenzo Colitti [Sat, 18 Jul 2015 17:24:01 +0000 (17:24 +0000)]
am 260a36d1: Make immutable NetworkCapabilities more explicit.

* commit '260a36d1b20469d39490b61fca610271bfa53df2':
  Make immutable NetworkCapabilities more explicit.

9 years agoConnectivityManager API for for packet keepalives.
Lorenzo Colitti [Mon, 15 Jun 2015 05:29:22 +0000 (14:29 +0900)]
ConnectivityManager API for for packet keepalives.

Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc

9 years agoMake immutable NetworkCapabilities more explicit.
Lorenzo Colitti [Wed, 8 Jul 2015 03:49:04 +0000 (12:49 +0900)]
Make immutable NetworkCapabilities more explicit.

Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1

9 years agoFixed issue with background user window consuming touch events
Wale Ogunwale [Sat, 18 Jul 2015 05:29:54 +0000 (22:29 -0700)]
Fixed issue with background user window consuming touch events

When adding a window for a background user, it is possible for
the window to consume touch events because it is in the
COMMIT_DRAW_PENDING state. We allow the background user window
to transition READY_TO_SHOW state, but hide the window.

Change is based on https://android-review.googlesource.com/#/c/158772
and also reverts commits 6ee618509a392adb183c2e70390cd9e2031ff0d8
and 588932a53e63c0a7ee281dea22559c129b40eb99

Bug: 22531717
Bug: 22207948
Bug: 18510914
https://code.google.com/p/android-developer-preview/issues/detail?id=2667

Change-Id: I68d2e532c2b1def0d7b22c9b60e48110cf3cd686

9 years agoam 17a838e5: am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec
Jorim Jaggi [Sat, 18 Jul 2015 01:34:40 +0000 (01:34 +0000)]
am 17a838e5: am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec

* commit '17a838e5c772da2e94be7aebafdc998fad3624b0':
  Adjust fingerprint icon placement to spec

9 years agoam 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec
Jorim Jaggi [Sat, 18 Jul 2015 01:19:53 +0000 (01:19 +0000)]
am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec

* commit '9029ae2b89c5abf0fb7013e8b98216b3ae4a01c2':
  Adjust fingerprint icon placement to spec

9 years agoam 29cf9aea: Adjust fingerprint icon placement to spec
Jorim Jaggi [Sat, 18 Jul 2015 01:04:55 +0000 (01:04 +0000)]
am 29cf9aea: Adjust fingerprint icon placement to spec

* commit '29cf9aea5490c42b85aaaa98b6784daff82629f8':
  Adjust fingerprint icon placement to spec

9 years agoAdjust fingerprint icon placement to spec
Jorim Jaggi [Fri, 17 Jul 2015 19:00:34 +0000 (12:00 -0700)]
Adjust fingerprint icon placement to spec

Bug: 22502068
Change-Id: I12952cb1ea43f365d5a63ec2636a5d60a981b93f

9 years agoam fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders...
Chris Craik [Sat, 18 Jul 2015 00:37:17 +0000 (00:37 +0000)]
am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

* commit 'fbd2d949587b1b7a14f98f5ed3fb33c3b4978a93':
  Fix AssetAtlas usage in BitmapShaders

9 years agoam b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
Chris Craik [Sat, 18 Jul 2015 00:24:55 +0000 (00:24 +0000)]
am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

* commit 'b6e41a08826d01dba3ad30c14e72e3531d22d0ad':
  Fix AssetAtlas usage in BitmapShaders

9 years agoam 9f71f05b: am 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev
Adrian Roos [Sat, 18 Jul 2015 00:09:18 +0000 (00:09 +0000)]
am 9f71f05b: am 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev

* commit '9f71f05be09020136dfa8a9cad52d0200dd7f5d0':
  Fix image wallpaper size

9 years agoam 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provi...
Jeff Sharkey [Sat, 18 Jul 2015 00:09:13 +0000 (00:09 +0000)]
am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit '49de87a1ce20e08d0fea8c6415c86854dfcbb861':
  Clear identity when killing media provider.

9 years agoam 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
Chris Craik [Sat, 18 Jul 2015 00:07:13 +0000 (00:07 +0000)]
am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders

9 years agoMerge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
Chris Craik [Fri, 17 Jul 2015 23:59:14 +0000 (23:59 +0000)]
Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

9 years agoam 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev
Adrian Roos [Fri, 17 Jul 2015 23:54:10 +0000 (23:54 +0000)]
am 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev

* commit '1f72739a0b546d8a26ec0f704fcfeaf9d051fd37':
  Fix image wallpaper size