drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,278 Commits 1 Branch 0 Tags
Commit Graph

198278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
eeeb45a76d am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev 
* commit '47b9d250220f7eaaef7465367fd6ff0d2c86f4e1':
  Fix hotspot brokenness
 2015-07-20 21:17:37 +00:00
Jae Seo
c160c231ab am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 
* commit '48d707ae07df8b03585fc00880e61ebf7cdb6a5b':
  MediaSession: Do not lock on AudioManager.getStreamVolume
 2015-07-20 21:17:32 +00:00
Jeff Sharkey
f811d7fc0f am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev 
* commit 'fe7a311c421473f1b50dcd2751585f89664a4327':
  Inherit ABI when moving existing install.
 2015-07-20 21:17:28 +00:00
Roozbeh Pournader
e043a74bd0 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().
 2015-07-20 20:56:57 +00:00
Jason Monk
47b9d25022 am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev 
* commit '33c619bb52c9e3e62b7243c9b1d9a75189885427':
  Fix hotspot brokenness
 2015-07-20 20:55:19 +00:00
Jae Seo
48d707ae07 am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 
* commit '26f7720ed0d6a0894772d82b7ebed03ac686c6f3':
  MediaSession: Do not lock on AudioManager.getStreamVolume
 2015-07-20 20:55:14 +00:00
Jeff Sharkey
fe7a311c42 am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev 
* commit '35ba2cdbf8654d708e57d209131dd498705d0e18':
  Inherit ABI when moving existing install.
 2015-07-20 20:55:09 +00:00
Jason Monk
33c619bb52 Merge "Fix hotspot brokenness" into mnc-dev 2015-07-20 20:47:33 +00:00
Jae Seo
26f7720ed0 Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 2015-07-20 20:45:11 +00:00
Jeff Sharkey
35ba2cdbf8 Merge "Inherit ABI when moving existing install." into mnc-dev 2015-07-20 20:44:56 +00:00
Jeff Sharkey
40cda8ef7c 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
 2015-07-20 13:40:20 -07:00
Roozbeh Pournader
91bb9d0a84 am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev 
* commit '9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
  Bidi-wrap the results of format[Short]FileSize().
 2015-07-20 20:40:10 +00:00
Roozbeh Pournader
9bdb7bfd35 Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev 2015-07-20 20:30:39 +00:00
Geoff Mendal
5038b92e6a am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ddb33d7d879159471cee10bf471a6815e76ac376':
  Import translations. DO NOT MERGE
 2015-07-20 20:12:55 +00:00
Dianne Hackborn
5cdc7f045f 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...
 2015-07-20 20:12:48 +00:00
Geoff Mendal
44c44a2b6a am ca49ae5a: (-s ours) Import translations. DO NOT MERGE 
* commit 'ca49ae5a5e851a1f5c761261bdd544174e095c0e':
  Import translations. DO NOT MERGE
 2015-07-20 20:12:43 +00:00
Wale Ogunwale
7e640edeb3 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
 2015-07-20 20:12:38 +00:00
Geoff Mendal
ddb33d7d87 am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a6bf393dc5b022f11c698dda610e209b5090d8c0':
  Import translations. DO NOT MERGE
 2015-07-20 20:02:37 +00:00
Dianne Hackborn
3aefa43830 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...
 2015-07-20 20:02:32 +00:00
Geoff Mendal
a6bf393dc5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-20 19:58:42 +00:00
Geoff Mendal
ca49ae5a5e Import translations. DO NOT MERGE 
Change-Id: I08703b57a1fe0b578bcb7e5f2a2e7d9c2904526f
Auto-generated-cl: translation import
 2015-07-20 12:53:55 -07:00
Geoff Mendal
11e1e19a61 Import translations. DO NOT MERGE 
Change-Id: I41156105dcb753a1d9338cdbacebe03d2b4b4f1d
Auto-generated-cl: translation import
 2015-07-20 12:51:19 -07:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d 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
 2015-07-20 12:49:10 -07:00
Ricardo Garcia
f2fd500262 am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '238f03c9b38182c2e4347ece097b4cb18ba926ab':
  Fix for MidiManager bug
 2015-07-20 19:11:07 +00:00
Wale Ogunwale
81696d1336 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
 2015-07-20 19:11:06 +00:00
Ricardo Garcia
238f03c9b3 am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug
 2015-07-20 18:47:21 +00:00
Wale Ogunwale
bde85f741c Merge "Fixed issue with background user window consuming touch events" into mnc-dev 2015-07-20 18:46:00 +00:00
Billy Lau
e4bcf4803b 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
 2015-07-20 18:43:56 +00:00
Jeff Sharkey
f14e4435e0 am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '0fa2a56c3bc88cd4f3cddee99528c7e8a57af4d6':
  Better logging of MediaPlayer failure reason.
 2015-07-20 18:43:51 +00:00
Jean-Michel Trivi
34e75a9bba 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.
 2015-07-20 18:43:47 +00:00
Billy Lau
dd0602e89d 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
 2015-07-20 18:04:08 +00:00
Jeff Sharkey
0fa2a56c3b am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '71780e79846d0ccc2aef2214041657410a8a14c2':
  Better logging of MediaPlayer failure reason.
 2015-07-20 18:04:04 +00:00
Jean-Michel Trivi
c1aaeead6e 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.
 2015-07-20 18:04:01 +00:00
Christopher Tate
9606921b76 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
 2015-07-20 18:03:55 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Jeff Sharkey
71780e7984 Merge "Better logging of MediaPlayer failure reason." into mnc-dev 2015-07-20 17:37:09 +00:00
Billy Lau
24b9c8314b 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
 2015-07-20 18:36:39 +01:00
Christopher Tate
0fc1e88c05 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
 2015-07-20 17:27:56 +00:00
Jean-Michel Trivi
698250fae7 Merge "Media button intent should be send to current user only." into mnc-dev 2015-07-20 17:25:32 +00:00
Christopher Tate
6afdad7e88 Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev 2015-07-20 17:05:32 +00:00
Jeff Sharkey
4fa85b7cad Better logging of MediaPlayer failure reason. 
Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
 2015-07-20 09:38:02 -07:00
Jason Monk
dd5bdc6a78 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
 2015-07-20 12:23:30 -04:00
Geoff Mendal
753dc06107 am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859':
  Import translations. DO NOT MERGE
 2015-07-20 16:06:38 +00:00
Geoff Mendal
34c7ef5d59 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-20 15:58:53 +00:00
Geoff Mendal
336bb9165f Import translations. DO NOT MERGE 
Change-Id: Ib98726d7c1b13a15d59e90a4e51b79542b0ff418
Auto-generated-cl: translation import
 2015-07-20 10:47:33 -05:00
Geoff Mendal
f3d1f3af76 am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5cc92074091ad5223380bf65e22ad054e9f2211f':
  Import translations. DO NOT MERGE
 2015-07-20 14:32:47 +00:00
Geoff Mendal
7b2319d016 am c0fa470d: (-s ours) Import translations. DO NOT MERGE 
* commit 'c0fa470da08460dc749e24107c904f47e3ee0d94':
  Import translations. DO NOT MERGE
 2015-07-20 14:32:42 +00:00
Geoff Mendal
5cc9207409 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-20 14:26:41 +00:00