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

205467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Burk
1b3eb741b5 am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 
* commit 'ca296978e7f2a1f70b8dca32b1db9372c2392458':
  MidiManager: fix double BTLE callback
 2015-10-12 22:04:43 +00:00
Phil Burk
ca296978e7 Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 2015-10-12 22:01:03 +00:00
Phil Burk
69ddaafac4 am 0a64b146: am e39def48: MidiService: update listener with current status when registered 
* commit '0a64b146d0bb65145a9644a8e2ad59e80fe37678':
  MidiService: update listener with current status when registered
 2015-10-12 21:39:12 +00:00
Phil Burk
0a64b146d0 am e39def48: MidiService: update listener with current status when registered 
* commit 'e39def480fd2d1bcc3a89751dd492d4634c38194':
  MidiService: update listener with current status when registered
 2015-10-12 21:35:12 +00:00
Phil Burk
7688911b9f MidiBluetoothService: add new device to HashMap 
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit e5f722e55c5708c2b48b8c9688c135e451225032)
 2015-10-12 21:03:30 +00:00
Phil Burk
afa038c074 MidiManager: fix double BTLE callback 
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
 2015-10-12 21:01:35 +00:00
Phil Burk
e39def480f MidiService: update listener with current status when registered 
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit b2355940e3e697deeecd1b6511cd5094f9dc553a)
 2015-10-12 20:59:57 +00:00
Alan Viverette
ff95329400 am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 
* commit 'd9635e60f00ccd10187a6dd0c51243a201d55ab3':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
 2015-10-12 19:52:12 +00:00
Alan Viverette
d9635e60f0 am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 
* commit 'c83a6121d214631c0a52be5b2c5c8ce2f6470ed0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
 2015-10-12 19:46:31 +00:00
Alan Viverette
c83a6121d2 Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 2015-10-12 19:41:10 +00:00
Dianne Hackborn
ff71f26fc5 am 51591b91: am 6cc3735a: Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev 
* commit '51591b91a35f1227996121c2803990a62b328475':
  Fix issue #23581553: Ignore Battery Optimization not work for re-install app
 2015-10-12 19:22:23 +00:00
Dianne Hackborn
51591b91a3 am 6cc3735a: Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev 
* commit '6cc3735a492abd1c17f15a46287de70e62bf116d':
  Fix issue #23581553: Ignore Battery Optimization not work for re-install app
 2015-10-12 19:16:02 +00:00
Dianne Hackborn
6cc3735a49 Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev 2015-10-12 19:11:46 +00:00
Adam Lesinski
06c07a1207 Add additional density enums to android:screenDensity attribute 
Bug:24804021
Change-Id: I70c34da9ca5d186aa1ffaacf7f15180d4c4b81e1
 2015-10-12 18:25:42 +00:00
Wale Ogunwale
9fc47b087a am b394e6de: am 5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode 
* commit 'b394e6de9be16994f04ca17c057269e9f9b35083':
  Use effectiveUid instead of callingUid to set lockTaskMode
 2015-10-12 18:11:04 +00:00
Wale Ogunwale
b394e6de9b am 5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode 
* commit '5c18d0517749cf2e65d19ea6bec938a4eb6c39e5':
  Use effectiveUid instead of callingUid to set lockTaskMode
 2015-10-12 18:04:05 +00:00
Dianne Hackborn
1b79ad74ef Fix issue #23581553: Ignore Battery Optimization not work for re-install app 
Remove from whitelist as appropriate.  Also be sure we can find whitelisted
apps even if they are not installed in the primary user.

Change-Id: I3ed13dca99b3ba177af8f7bd26a75258df9b6949
 2015-10-12 10:59:47 -07:00
Wale Ogunwale
5c18d05177 Use effectiveUid instead of callingUid to set lockTaskMode 
The callingUid can be different from that of the app been locked
(e.g. was launched from launcher) there by leading to the app crashing
when it tries to exit lockTaskMode.

Bug: 24146132
Change-Id: I03346fabd1d7e61b29178220c72f747a0600f5ec
 2015-10-12 17:40:56 +00:00
Miao Wang
41333316d7 am 46811dd9: am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev 
* commit '46811dd9df0cbef68f69e938a52b418ba927882a':
  [RenderScript] pass correct length of ains to BLAS functions
 2015-10-12 16:57:15 +00:00
Miao Wang
46811dd9df am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev 
* commit 'c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5':
  [RenderScript] pass correct length of ains to BLAS functions
 2015-10-12 16:52:34 +00:00
Jeff Sharkey
97604b42d9 am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev 
* commit '9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
  Fix parole scheduling bugs.
 2015-10-12 16:49:05 +00:00
Jeff Sharkey
75051c3a62 am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev 
* commit '7f6d8754e6d509bf17fe0c46130c884b16706b12':
  Push firewall rules up to ConnectivityService.
 2015-10-12 16:48:59 +00:00
Jeff Sharkey
8feaed95cf am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 
* commit 'da5d9af80530e6bf662178668bef3ef3b926fe73':
  Default location is "internalOnly" when undefined.
 2015-10-12 16:48:53 +00:00
Miao Wang
c4c42d55f0 Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev 2015-10-12 16:46:55 +00:00
Jeff Sharkey
9f1ae4dc26 am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev 
* commit 'fe9c950a49a9bcdb9e35f709a7d1fffad58aa414':
  Fix parole scheduling bugs.
 2015-10-12 16:39:38 +00:00
Jeff Sharkey
7f6d8754e6 am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev 
* commit 'a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
  Push firewall rules up to ConnectivityService.
 2015-10-12 16:39:34 +00:00
Jeff Sharkey
da5d9af805 am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 
* commit 'fe45f1b97a1f572ce453193035f1fabf7957cc03':
  Default location is "internalOnly" when undefined.
 2015-10-12 16:39:29 +00:00
Jeff Sharkey
fe9c950a49 Merge "Fix parole scheduling bugs." into mnc-dr-dev 2015-10-12 16:34:37 +00:00
Jeff Sharkey
a03ecf7d7c Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev 2015-10-12 16:34:19 +00:00
Jeff Sharkey
fe45f1b97a Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 2015-10-12 16:34:03 +00:00
Vinu Deokaran
f67471900a am 04166953: am 6be61a98: wm: call displayReady for all built in displays when system is ready. 
* commit '0416695348eae12cae0baa5adee65004d0caabe5':
  wm: call displayReady for all built in displays when system is ready.
 2015-10-12 16:16:31 +00:00
Vinu Deokaran
0416695348 am 6be61a98: wm: call displayReady for all built in displays when system is ready. 
* commit '6be61a98fccbadfdcfcefe9aa51d90bfb6c13901':
  wm: call displayReady for all built in displays when system is ready.
 2015-10-12 16:09:46 +00:00
Vinu Deokaran
6be61a98fc wm: call displayReady for all built in displays when system is ready. 
When system has more than one built in display, displayReady needs
to be called for all built in displays when window manager is ready.
Otherwise, some system services, such as presentation, mediarouter,
etc, won't work on these displays.

Bug: 24103683
Change-Id: Ibf08074eff555c14a318236bd06e7b4855503140
 2015-10-12 16:00:54 +00:00
Geoff Mendal
99ec359500 am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit 'ef2f659641d3eec9129ad726176c27818cc9d4d0':
  Import translations. DO NOT MERGE
 2015-10-12 14:27:25 +00:00
Geoff Mendal
ef2f659641 am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit 'ac3b53a734df0ec994d6068b7c0331da1fa0aa80':
  Import translations. DO NOT MERGE
 2015-10-12 14:20:03 +00:00
Geoff Mendal
ac3b53a734 Import translations. DO NOT MERGE 
Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313
Auto-generated-cl: translation import
 2015-10-12 07:03:29 -07:00
Lorenzo Colitti
553a934c47 am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '647ec7f80e46aa7c9b251d942bc2862646b57b3f':
  Connect the DHCP UDP socket to the server.
 2015-10-11 14:11:31 +00:00
Lorenzo Colitti
871d96b44c am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit '13c5dd5c19c5bcc60910b4e37f4e9e171adf099b':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 14:11:25 +00:00
Lorenzo Colitti
647ec7f80e am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '4e4d59eeef86fa8560d35c00168869b0a066f962':
  Connect the DHCP UDP socket to the server.
 2015-10-11 13:43:34 +00:00
Lorenzo Colitti
13c5dd5c19 am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit 'eb0bbd45f62fcaff26151b54a7b3ea16bb67e3be':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 13:43:24 +00:00
Lorenzo Colitti
4e4d59eeef Connect the DHCP UDP socket to the server. 
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.

Bug: 23906864
Bug: 23933386
Change-Id: Ib090273a417f7eb2ac1ee3309260249b72fb8345
 2015-10-11 16:06:11 +09:00
Lorenzo Colitti
eb0bbd45f6 Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* changes:
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 06:48:33 +00:00
Dianne Hackborn
4b77f2e53d am 94252b62: am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '94252b62079f8c852daca62d834d1680e3a602da':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 00:56:59 +00:00
Dianne Hackborn
94252b6207 am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '09e405d660c0fe696402d10732084888192ca446':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 00:48:41 +00:00
Dianne Hackborn
09e405d660 Merge "Fix issue #24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev 2015-10-10 00:42:02 +00:00
Dianne Hackborn
958b9d2ecc Fix issue #24743380: VoiceInteractionManagerService doesn't use current... 
...user for service info

Now it does.

The actual change is basically one line, passing in the current user
when building the service info.  The rest is more debugging output to
be able to see what is going on.

Change-Id: I451884e0780aac6ee92fd2cd520071894afdf586
 2015-10-09 16:09:25 -07:00
Deepanshu Gupta
2aa403fe0c Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev 2015-10-09 21:58:05 +00:00
Deepanshu Gupta
2f01cf2ea6 LayoutLib: Fix android:dependency for preferences. 
Bug: http://b.android.com/189314
Change-Id: I229632d11a2529e865f3f2e8eca3a78b47ad462c
 2015-10-09 14:54:19 -07:00
Miao Wang
d22b9b7757 [RenderScript] pass correct length of ains to BLAS functions 
bug: 24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
(cherry picked from commit 0b34f2a3c545cb112a23072c92214e359a8df8c6)
 2015-10-09 14:06:55 -07:00
Jeff Sharkey
c88a2d5b33 Default location is "internalOnly" when undefined. 
When an app doesn't define installLocation, the default behavior
should be to treat it as internal only.  This matches all the
published developer documentation.

Without this, apps could be unwittingly be moved to adopted storage
devices.

Bug: 24771264
Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
 2015-10-09 13:22:09 -07:00