OSDN Git Service
Svetoslav Ganov [Tue, 13 Oct 2015 00:20:58 +0000 (00:20 +0000)]
am
d93e404e: am
1b872618: am
7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
* commit '
d93e404ef27f5589248630a13f4bbac6ead9ff52':
Shared user retains permissions no longer used by any app on an app update
Adam Powell [Tue, 13 Oct 2015 00:20:51 +0000 (00:20 +0000)]
am
1901a9e1: am
40ce70c9: am
11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
* commit '
1901a9e199eee9102c829413528029dc25855987':
Add animation and positional stability to intent chooser UI
Dianne Hackborn [Tue, 13 Oct 2015 00:20:42 +0000 (00:20 +0000)]
am
05222c34: am
829920ed: am
34c120dc: Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '
05222c3440d1ba207fe6f87037a8297f33f3318a':
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
Adam Lesinski [Tue, 13 Oct 2015 00:20:24 +0000 (00:20 +0000)]
am
56f9a422: am
1c9d43eb: am
bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
* commit '
56f9a422be2d600da48d559e4838d07a44676c72':
Add additional density enums to android:screenDensity attribute
Phil Burk [Tue, 13 Oct 2015 00:20:17 +0000 (00:20 +0000)]
am
ff1e8f7e: am
1b3eb741: am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
ff1e8f7eeeb037a296d1fe49600927b5665fe8b7':
MidiManager: fix double BTLE callback
Phil Burk [Tue, 13 Oct 2015 00:20:06 +0000 (00:20 +0000)]
am
69ddaafa: am
0a64b146: am
e39def48: MidiService: update listener with current status when registered
* commit '
69ddaafac41a21b35b226ee22e189b9e7840e70f':
MidiService: update listener with current status when registered
Alan Viverette [Tue, 13 Oct 2015 00:19:30 +0000 (00:19 +0000)]
am
ff953294: am
d9635e60: am
c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit '
ff9532940084a89b4cfe89bc954e7d8af1c695f0':
Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
Svetoslav Ganov [Mon, 12 Oct 2015 23:49:36 +0000 (23:49 +0000)]
am
1b872618: am
7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
* commit '
1b8726182288900a0248c7a720a05f3d9c0e139e':
Shared user retains permissions no longer used by any app on an app update
Svetoslav Ganov [Mon, 12 Oct 2015 23:42:22 +0000 (23:42 +0000)]
am
7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
* commit '
7a097ff159466c4e887f1c821aeaa545f80e54b6':
Shared user retains permissions no longer used by any app on an app update
Adam Powell [Mon, 12 Oct 2015 23:40:07 +0000 (23:40 +0000)]
am
40ce70c9: am
11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
* commit '
40ce70c9c00144ede8d415a92dc411a53f2316f4':
Add animation and positional stability to intent chooser UI
Svetoslav Ganov [Mon, 12 Oct 2015 23:39:14 +0000 (23:39 +0000)]
Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
Adam Powell [Mon, 12 Oct 2015 23:33:22 +0000 (23:33 +0000)]
am
11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
* commit '
11af18783d32f8646428500a0ff3a2a57a77bf95':
Add animation and positional stability to intent chooser UI
Adam Powell [Mon, 12 Oct 2015 23:28:36 +0000 (23:28 +0000)]
Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
Dianne Hackborn [Mon, 12 Oct 2015 23:05:51 +0000 (23:05 +0000)]
am
829920ed: am
34c120dc: Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '
829920ede03dbfd51f803940faa27fa7bf15063c':
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
Svetoslav [Mon, 12 Oct 2015 22:58:06 +0000 (15:58 -0700)]
Shared user retains permissions no longer used by any app on an app update
If an app in a shared user uses permission A and B and these are granted
to the shared user and now an app update is installed that only uses A,
the shared user still ratains the B grant. A shared user should have only
permissions declared as used by its currenlty installed apps.
bug:
24736912
Change-Id: Idea6c06bdc236fd481a860cddb379e6ce660ee87
Dianne Hackborn [Mon, 12 Oct 2015 23:00:20 +0000 (23:00 +0000)]
am
34c120dc: Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '
34c120dc6142c861cb131c900cdee3c19f81ce51':
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
Dianne Hackborn [Mon, 12 Oct 2015 22:55:10 +0000 (22:55 +0000)]
Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack..." into mnc-dr-dev
Adam Lesinski [Mon, 12 Oct 2015 22:21:36 +0000 (22:21 +0000)]
am
1c9d43eb: am
bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
* commit '
1c9d43eb0f6cdb33cc004b674b117da95230ce59':
Add additional density enums to android:screenDensity attribute
Adam Lesinski [Mon, 12 Oct 2015 22:16:00 +0000 (22:16 +0000)]
am
bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
* commit '
bde2707f7cb8a5f97b3b077cd49bb034f1a359ff':
Add additional density enums to android:screenDensity attribute
Dianne Hackborn [Mon, 12 Oct 2015 22:14:16 +0000 (15:14 -0700)]
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
...due to lack of permissions
Still doesn't, but an alternative is now offered.
Change-Id: I7b9da709c96ed7790c70d686c30c7855f3979778
Adam Lesinski [Mon, 12 Oct 2015 22:11:51 +0000 (22:11 +0000)]
Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
Phil Burk [Mon, 12 Oct 2015 22:09:48 +0000 (22:09 +0000)]
am
1b3eb741: am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
1b3eb741b5a3f3baea4b6b101ed4e39c15845f13':
MidiManager: fix double BTLE callback
Dianne Hackborn [Mon, 12 Oct 2015 22:05:09 +0000 (22:05 +0000)]
am
ff71f26f: am
51591b91: am
6cc3735a: Merge "Fix issue #
23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev
* commit '
ff71f26fc5bbe58731d3d72853e8033ddaa31f2e':
Fix issue #
23581553: Ignore Battery Optimization not work for re-install app
Wale Ogunwale [Mon, 12 Oct 2015 22:04:59 +0000 (22:04 +0000)]
am
9fc47b08: am
b394e6de: am
5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '
9fc47b087acc6901034beb6282330080cdb29446':
Use effectiveUid instead of callingUid to set lockTaskMode
Phil Burk [Mon, 12 Oct 2015 22:04:43 +0000 (22:04 +0000)]
am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
ca296978e7f2a1f70b8dca32b1db9372c2392458':
MidiManager: fix double BTLE callback
Phil Burk [Mon, 12 Oct 2015 22:01:03 +0000 (22:01 +0000)]
Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
Phil Burk [Mon, 12 Oct 2015 21:39:12 +0000 (21:39 +0000)]
am
0a64b146: am
e39def48: MidiService: update listener with current status when registered
* commit '
0a64b146d0bb65145a9644a8e2ad59e80fe37678':
MidiService: update listener with current status when registered
Phil Burk [Mon, 12 Oct 2015 21:35:12 +0000 (21:35 +0000)]
am
e39def48: MidiService: update listener with current status when registered
* commit '
e39def480fd2d1bcc3a89751dd492d4634c38194':
MidiService: update listener with current status when registered
Phil Burk [Fri, 21 Aug 2015 22:22:35 +0000 (15:22 -0700)]
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)
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
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)
Alan Viverette [Mon, 12 Oct 2015 19:52:12 +0000 (19:52 +0000)]
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
Alan Viverette [Mon, 12 Oct 2015 19:46:31 +0000 (19:46 +0000)]
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
Alan Viverette [Mon, 12 Oct 2015 19:41:10 +0000 (19:41 +0000)]
Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
Adam Lesinski [Mon, 12 Oct 2015 19:40:21 +0000 (19:40 +0000)]
am
651cb804: am
fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit '
651cb804b12614094c2b69a2133c8c0b2083556e':
RRO: idmap: allow flock(2) to block
Adam Lesinski [Mon, 12 Oct 2015 19:40:14 +0000 (19:40 +0000)]
am
287cd2d1: am
bac309ca: Merge "RRO: idmap: fix sorting of overlays.list"
* commit '
287cd2d1e4fc6cc77b466f51d24a1c3e086140ae':
RRO: idmap: fix sorting of overlays.list
Adam Lesinski [Mon, 12 Oct 2015 19:40:06 +0000 (19:40 +0000)]
am
6382a950: am
2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '
6382a950cdd651070bcdedd5f89e6fc78e2b0450':
Handle 'root' pseudo-package in the appops command
Adam Lesinski [Mon, 12 Oct 2015 19:34:43 +0000 (19:34 +0000)]
am
fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit '
fe1934e470681ff7ec5b8ec0609ae9fe24bd7282':
RRO: idmap: allow flock(2) to block
Adam Lesinski [Mon, 12 Oct 2015 19:34:37 +0000 (19:34 +0000)]
am
bac309ca: Merge "RRO: idmap: fix sorting of overlays.list"
* commit '
bac309ca8f4ecd1a835aa36f4be2a1fa45577eab':
RRO: idmap: fix sorting of overlays.list
Adam Lesinski [Mon, 12 Oct 2015 19:34:28 +0000 (19:34 +0000)]
am
2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '
2327239d65525d8ba2bdbedd6e59809fef447a12':
Handle 'root' pseudo-package in the appops command
Adam Lesinski [Mon, 12 Oct 2015 19:30:23 +0000 (19:30 +0000)]
Merge "RRO: idmap: allow flock(2) to block"
Adam Lesinski [Mon, 12 Oct 2015 19:29:39 +0000 (19:29 +0000)]
Merge "RRO: idmap: fix sorting of overlays.list"
Adam Lesinski [Mon, 12 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Merge "Handle 'root' pseudo-package in the appops command"
Dianne Hackborn [Mon, 12 Oct 2015 19:22:23 +0000 (19:22 +0000)]
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
Dianne Hackborn [Mon, 12 Oct 2015 19:16:02 +0000 (19:16 +0000)]
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
Dianne Hackborn [Mon, 12 Oct 2015 19:11:46 +0000 (19:11 +0000)]
Merge "Fix issue #
23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev
Adam Lesinski [Mon, 12 Oct 2015 19:06:43 +0000 (19:06 +0000)]
am
6029dfa8: am
7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '
6029dfa81a01ab41318a8e9601448387179f8703':
Make 'idmap --scan' accept more than one input directory
Adam Lesinski [Mon, 12 Oct 2015 18:59:03 +0000 (18:59 +0000)]
am
7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '
7caa8f14a78d279e0392089dca2f54f27e7f5d15':
Make 'idmap --scan' accept more than one input directory
Adam Lesinski [Mon, 12 Oct 2015 18:53:25 +0000 (18:53 +0000)]
Merge "Make 'idmap --scan' accept more than one input directory"
Adam Lesinski [Fri, 9 Oct 2015 20:14:07 +0000 (13:14 -0700)]
Add additional density enums to android:screenDensity attribute
Bug:
24804021
Change-Id: I70c34da9ca5d186aa1ffaacf7f15180d4c4b81e1
Wale Ogunwale [Mon, 12 Oct 2015 18:11:04 +0000 (18:11 +0000)]
am
b394e6de: am
5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '
b394e6de9be16994f04ca17c057269e9f9b35083':
Use effectiveUid instead of callingUid to set lockTaskMode
Wale Ogunwale [Mon, 12 Oct 2015 18:04:05 +0000 (18:04 +0000)]
am
5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '
5c18d0517749cf2e65d19ea6bec938a4eb6c39e5':
Use effectiveUid instead of callingUid to set lockTaskMode
Dianne Hackborn [Mon, 12 Oct 2015 17:59:47 +0000 (10:59 -0700)]
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
Wale Ogunwale [Mon, 12 Oct 2015 17:34:14 +0000 (10:34 -0700)]
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
Miao Wang [Mon, 12 Oct 2015 17:04:11 +0000 (17:04 +0000)]
am
41333316: am
46811dd9: am
c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '
41333316d7aead817295d163618da7931200534b':
[RenderScript] pass correct length of ains to BLAS functions
Miao Wang [Mon, 12 Oct 2015 16:57:15 +0000 (16:57 +0000)]
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
Jeff Sharkey [Mon, 12 Oct 2015 16:56:03 +0000 (16:56 +0000)]
am
97604b42: am
9f1ae4dc: am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
97604b42d997e0c577d33c21f7a48ef1a73185ab':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:55:58 +0000 (16:55 +0000)]
am
75051c3a: am
7f6d8754: am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
75051c3a62123b4668231d0243ba11462e02ac5a':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:55:52 +0000 (16:55 +0000)]
am
8feaed95: am
da5d9af8: am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
8feaed95cfc79cc96a0c0a18c3db8154dd9f551a':
Default location is "internalOnly" when undefined.
Miao Wang [Mon, 12 Oct 2015 16:52:34 +0000 (16:52 +0000)]
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
Jeff Sharkey [Mon, 12 Oct 2015 16:49:05 +0000 (16:49 +0000)]
am
9f1ae4dc: am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:48:59 +0000 (16:48 +0000)]
am
7f6d8754: am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
7f6d8754e6d509bf17fe0c46130c884b16706b12':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:48:53 +0000 (16:48 +0000)]
am
da5d9af8: am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
da5d9af80530e6bf662178668bef3ef3b926fe73':
Default location is "internalOnly" when undefined.
Miao Wang [Mon, 12 Oct 2015 16:46:55 +0000 (16:46 +0000)]
Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:39:38 +0000 (16:39 +0000)]
am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
fe9c950a49a9bcdb9e35f709a7d1fffad58aa414':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:39:34 +0000 (16:39 +0000)]
am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:39:29 +0000 (16:39 +0000)]
am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
fe45f1b97a1f572ce453193035f1fabf7957cc03':
Default location is "internalOnly" when undefined.
Jeff Sharkey [Mon, 12 Oct 2015 16:34:37 +0000 (16:34 +0000)]
Merge "Fix parole scheduling bugs." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:34:19 +0000 (16:34 +0000)]
Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:34:03 +0000 (16:34 +0000)]
Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
Vinu Deokaran [Mon, 12 Oct 2015 16:21:20 +0000 (16:21 +0000)]
am
f6747190: am
04166953: am
6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '
f67471900a36d272aac77425274593495331fcbc':
wm: call displayReady for all built in displays when system is ready.
Vinu Deokaran [Mon, 12 Oct 2015 16:16:31 +0000 (16:16 +0000)]
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.
Vinu Deokaran [Mon, 12 Oct 2015 16:09:46 +0000 (16:09 +0000)]
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.
Vinu Deokaran [Tue, 16 Dec 2014 15:52:52 +0000 (10:52 -0500)]
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
Wale Ogunwale [Mon, 12 Oct 2015 14:50:32 +0000 (14:50 +0000)]
am
83a39080: am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
83a3908047f3438c5daf7c3b562cf9ad8fe76d71':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:44:46 +0000 (14:44 +0000)]
am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
1ca9f4812749a3eff0654e2ea7773e8b3704c1da':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."
Geoff Mendal [Mon, 12 Oct 2015 14:34:53 +0000 (14:34 +0000)]
am
99ec3595: (-s ours) am
ef2f6596: (-s ours) am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
99ec3595002f98e4c67a8c23e8ef33590e460235':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:27:25 +0000 (14:27 +0000)]
am
ef2f6596: (-s ours) am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
ef2f659641d3eec9129ad726176c27818cc9d4d0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:20:03 +0000 (14:20 +0000)]
am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
ac3b53a734df0ec994d6068b7c0331da1fa0aa80':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:03:29 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313
Auto-generated-cl: translation import
Mark Lu [Thu, 8 Oct 2015 05:31:01 +0000 (13:31 +0800)]
Fix resumeHomeStackTask can't resume home if activity is finishing.
Not to resume home activity in finishing stage as following case:
When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),
If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.
Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
Pirama Arumuga Nainar [Sun, 11 Oct 2015 18:07:37 +0000 (18:07 +0000)]
am
05f0dc28: am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
05f0dc2891377ab21b3a4262e9f5dc6fc768a2af':
Fix punctuation and typos in AllocationAdapter's documentation.
Lorenzo Colitti [Sun, 11 Oct 2015 14:20:04 +0000 (14:20 +0000)]
am
553a934c: am
647ec7f8: am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
553a934c47ec255b84647fa8e603bd4edf8fd7cd':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 14:19:58 +0000 (14:19 +0000)]
am
871d96b4: am
13c5dd5c: am
eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '
871d96b44c9665238d1df87ed89656f742abe2fa':
Support DHCP replies with multiple default gateways.
Accept DHCP responses from non-67 server source ports
Improve logging of DHCP parse errors using exceptions.
Lorenzo Colitti [Sun, 11 Oct 2015 14:11:31 +0000 (14:11 +0000)]
am
647ec7f8: am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
647ec7f80e46aa7c9b251d942bc2862646b57b3f':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 14:11:25 +0000 (14:11 +0000)]
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.
Lorenzo Colitti [Sun, 11 Oct 2015 13:43:34 +0000 (13:43 +0000)]
am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
4e4d59eeef86fa8560d35c00168869b0a066f962':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 13:43:24 +0000 (13:43 +0000)]
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.
Lorenzo Colitti [Thu, 10 Sep 2015 09:12:18 +0000 (18:12 +0900)]
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
Lorenzo Colitti [Sun, 11 Oct 2015 06:48:33 +0000 (06:48 +0000)]
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.
Dianne Hackborn [Sat, 10 Oct 2015 01:06:27 +0000 (01:06 +0000)]
am
4b77f2e5: am
94252b62: am
09e405d6: Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev
* commit '
4b77f2e53dba8288642aa6223658560eb2faeaf5':
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
Dianne Hackborn [Sat, 10 Oct 2015 00:56:59 +0000 (00:56 +0000)]
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...
Dianne Hackborn [Sat, 10 Oct 2015 00:48:41 +0000 (00:48 +0000)]
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...
Dianne Hackborn [Sat, 10 Oct 2015 00:42:02 +0000 (00:42 +0000)]
Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev
Dianne Hackborn [Fri, 9 Oct 2015 23:09:25 +0000 (16:09 -0700)]
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
Deepanshu Gupta [Fri, 9 Oct 2015 22:04:16 +0000 (22:04 +0000)]
am
2aa403fe: Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev
* commit '
2aa403fe0c86291c6fd65317e93a72549e6e10de':
LayoutLib: Fix android:dependency for preferences.
Deepanshu Gupta [Fri, 9 Oct 2015 21:58:05 +0000 (21:58 +0000)]
Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev
Deepanshu Gupta [Fri, 9 Oct 2015 21:54:19 +0000 (14:54 -0700)]
LayoutLib: Fix android:dependency for preferences.
Bug: http://b.android.com/189314
Change-Id: I229632d11a2529e865f3f2e8eca3a78b47ad462c
Miao Wang [Wed, 30 Sep 2015 22:38:07 +0000 (15:38 -0700)]
[RenderScript] pass correct length of ains to BLAS functions
bug:
24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
(cherry picked from commit
0b34f2a3c545cb112a23072c92214e359a8df8c6)
Jeff Sharkey [Fri, 9 Oct 2015 20:22:09 +0000 (13:22 -0700)]
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
OSDN Git Service
