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

204617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geoff Mendal
e205930345 am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'df808132d0233e259cae74ff3e9df6407f631321':
  Import translations. DO NOT MERGE
 2015-07-20 17:10:42 +00:00
Roozbeh Pournader
007262e0ae Fix default value of stereoReset() in the documentation. 
The default has been 'true' for eternity in the code. But the
documentation was mistakenly saying it was 'false'. Going with the
code, since there are people out there relying on the code continuing
to work the same way.

Bug: 22557371
Change-Id: I6f4e7b2052d0cc30d41e8ccf2b9a5c6111fa0ab7
 2015-07-20 10:08:58 -07: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
df808132d0 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
 2015-07-20 16:20:59 +00: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
15f7635522 am 7fa4d2a7: (-s ours) am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '7fa4d2a748b94aaddba1a523e671eeea4031ce64':
  Import translations. DO NOT MERGE
 2015-07-20 15:00:28 +00:00
Geoff Mendal
d58a035f95 am bf9b9b1e: (-s ours) am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE 
* commit 'bf9b9b1e44ef0edfa0f325ee8141f9a09111cbc6':
  Import translations. DO NOT MERGE
 2015-07-20 15:00:22 +00:00
Geoff Mendal
7fa4d2a748 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
 2015-07-20 14:46:00 +00:00
Geoff Mendal
bf9b9b1e44 am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE 
* commit '7b2319d016ecc32ca42819a0f6caa62a9681d137':
  Import translations. DO NOT MERGE
 2015-07-20 14:45:55 +00: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
Geoff Mendal
653b913270 Import translations. DO NOT MERGE 
Change-Id: I63f59410a8081aaf9678e9d318ba308c259e1254
Auto-generated-cl: translation import
 2015-07-20 06:54:33 -07:00
Geoff Mendal
c0fa470da0 Import translations. DO NOT MERGE 
Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import
 2015-07-20 06:52:40 -07:00
Erik Kline
56066f6036 am f35e9344: am ec69003d: am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit 'f35e93446d5172446fa2cf37cac405a62cd54233':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 18:08:45 +00:00
Lorenzo Colitti
a169460950 am 1c6b02af: am da355c80: am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit '1c6b02af8b53982c2717c684e5cdd94618dff422':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 18:08:39 +00:00
Erik Kline
f35e93446d am ec69003d: am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit 'ec69003d9b7e22f57b6168796fd5510f26b32986':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 17:54:49 +00:00
Lorenzo Colitti
1c6b02af8b am da355c80: am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit 'da355c80b04ec4e606a00ac5f1dfae74dabb36db':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 17:54:42 +00:00
Lorenzo Colitti
15cda089b6 am 6163290e: am e647d93d: am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit '6163290e5975b0d4ebdecc20dfa41faac4b4ba79':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:51:42 +00:00
Lorenzo Colitti
2d2a59924d am 47a47d3b: am 00365fc6: am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '47a47d3b907325be3b851ce87f275e6032527c5e':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:51:36 +00:00
Erik Kline
ec69003d9b am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit '9d598e115f306e4f0860638c5647a959ac1320c5':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 17:41:11 +00:00
Lorenzo Colitti
da355c80b0 am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit 'c3f21f3b8b01508f5dc01b2e5fa4c3d652bb67bb':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 17:41:07 +00:00
Lorenzo Colitti
6163290e59 am e647d93d: am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit 'e647d93d6d3971423e3ef23a7ac6095e5c6c0586':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:33:38 +00:00
Lorenzo Colitti
47a47d3b90 am 00365fc6: am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '00365fc62e9a0a266b5998d9e1002d79acc6c5f9':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:33:32 +00:00
Erik Kline
9d598e115f Pass signal strength thresholds inside a Bundle 
Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
 2015-07-18 17:28:52 +00:00
Lorenzo Colitti
c3f21f3b8b Support NetworkCallbacks based on signal strength. 
Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
 2015-07-18 17:28:26 +00:00
Lorenzo Colitti
e647d93d6d am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit '8bf977d562b8f7261cf964bdf045b22bdbd92b7d':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:24:05 +00:00
Lorenzo Colitti
00365fc62e am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '260a36d1b20469d39490b61fca610271bfa53df2':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:24:01 +00:00
Lorenzo Colitti
8bf977d562 ConnectivityManager API for for packet keepalives. 
Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
 2015-07-18 17:00:13 +00:00
Lorenzo Colitti
260a36d1b2 Make immutable NetworkCapabilities more explicit. 
Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
 2015-07-18 16:59:47 +00:00
Wale Ogunwale
4eef94f2b8 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
 2015-07-17 22:29:54 -07:00
Jorim Jaggi
c10252707e am 9b12e6e8: am 17a838e5: am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '9b12e6e8b4b1631845e9579e8c790f50f721a844':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:46:08 +00:00
Jorim Jaggi
9b12e6e8b4 am 17a838e5: am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '17a838e5c772da2e94be7aebafdc998fad3624b0':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:34:40 +00:00
Jorim Jaggi
17a838e5c7 am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '9029ae2b89c5abf0fb7013e8b98216b3ae4a01c2':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:19:53 +00:00
Jorim Jaggi
9029ae2b89 am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '29cf9aea5490c42b85aaaa98b6784daff82629f8':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:04:55 +00:00
Jorim Jaggi
29cf9aea54 Adjust fingerprint icon placement to spec 
Bug: 22502068
Change-Id: I12952cb1ea43f365d5a63ec2636a5d60a981b93f
 2015-07-18 00:53:12 +00:00
Chris Craik
3699c60323 am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '62a2696cd2b7387ce20ec9cb9805563f313da86a':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:51:34 +00:00