TreeHugger Robot
d58da1be76
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-16 10:21:19 +00:00
Robin Lee
0e7abd3fba
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
...
am: 3e343ffd91
2016-06-16 10:10:23 +00:00
Robin Lee
3e343ffd91
Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev
2016-06-16 10:06:11 +00:00
Bill Yi
f924f2130f
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 65266b99d2
2016-06-16 10:03:34 +00:00
TreeHugger Robot
65266b99d2
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-16 09:58:56 +00:00
Yujie Qin
cad1666867
Report error correctly for the implementation of
...
StreamInterface::GetData()
Bug: 28889197
Change-Id: Id07755e1b3637f85b6176a59935ad3a5597cfb05
2016-06-16 11:42:41 +02:00
Bill Yi
ec038aa44a
Import translations. DO NOT MERGE
...
Change-Id: I8186498fb657aa424eeb74f965fa44f7a053f65c
Auto-generated-cl: translation import
2016-06-16 01:42:16 -07:00
Bill Yi
ea1edaca72
Import translations. DO NOT MERGE
...
Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import
2016-06-15 21:49:11 -07:00
Selim Cinek
0630d92064
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
2016-06-16 04:19:48 +00:00
Dan Willemsen
9b3bc98425
Remove unused link to libcutils
...
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.
Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
2016-06-15 21:14:28 -07:00
Ruben Brunk
268a22feb6
Remove coarse location pre-grant for preinstalled VrListenerServices.
...
am: d430f1a0be
2016-06-16 01:37:26 +00:00
Ruben Brunk
d430f1a0be
Remove coarse location pre-grant for preinstalled VrListenerServices.
...
Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6
2016-06-15 17:55:41 -07:00
Christopher Tate
e227ec61c2
Let bmgr inspect the set of whitelisted transports
...
Needed for compliance testing.
Bug 29072466
Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Ruben Brunk
336a7cb9b5
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
...
am: 931a7c03e0
2016-06-16 00:38:05 +00:00
Mihai Nita
d80a8e8fe7
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
...
am: c8c9afeacb
2016-06-16 00:37:54 +00:00
Dianne Hackborn
7ab4025474
Fix issue #29371078 : Foreground jobs should not count...
...
...as active for idle maintenance
Nor jobs of whitelisted apps.
Now they don't.
Also remove the no longer used "active download" tracking code.
Change-Id: I553197801f6eabaf15716f3201dd65257a0d4e94
2016-06-15 17:30:24 -07:00
Ruben Brunk
931a7c03e0
Merge "Fix VR transition for display on/off sequence." into nyc-dev
2016-06-16 00:29:32 +00:00
Mihai Niță
c8c9afeacb
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
2016-06-16 00:28:37 +00:00
Ruben Brunk
af9f004f99
Fix VR transition for display on/off sequence.
...
- Ensure VR transition has been applied before display power
off sequence.
Bug: 29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d
2016-06-15 17:24:35 -07:00
Amith Yamasani
bf1301f542
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:17 +00:00
Amith Yamasani
4f2b1b455e
Merge "More thorough cleansing of expired users" into nyc-dev
2016-06-16 00:14:59 +00:00
Mihai Nita
1711d430cb
Fix for NullPointerException in SuggestedLocaleAdapter
...
Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
2016-06-15 17:07:10 -07:00
Svet Ganov
3138a9938b
Don't dispatch Uris with appended user handle
...
This change fixes a bug where we started appending the user id
to the changing Uri for observers to know what user's Uri changed.
This is problematic as it changes the Uri structure expected by
observers. Also there are no public APIs to factor out the user
id from the Uri. If a system component needs to know for which
user a Uri changed it can use ContentObserver#onChange(boolean,
Uri, int) where the last argument is the user id.
bug:19312280
Change-Id: I5f0982ac3c8d6b6eab060bab65d3b53182660ac7
2016-06-15 16:57:36 -07:00
Selim Cinek
e9bad242f3
Added dismiss, expand, and collapse accessibility actions
...
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Mady Mellor
3cb4c159f7
Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
...
am: 8363980d45
2016-06-15 23:27:41 +00:00
Mady Mellor
8363980d45
Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev
2016-06-15 23:20:24 +00:00
Bert McMeen
717f3e999c
Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04
...
am: 0caf0b7259
2016-06-15 23:13:31 +00:00
Bert McMeen
0caf0b7259
Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am: 9011149e19
...
am: 7250594f04
2016-06-15 23:08:28 +00:00
AnubhavGupta
eed32008a8
Bluetooth: Send GET request as single packet
...
- If obex based profile explicitly sets GET with final flag, then
GET should always be sent as single packet request with final flag
set.
Change-Id: I82ff8295a239c4dbbfb4b3abfd358021820283cc
2016-06-15 23:06:31 +00:00
Bert McMeen
7250594f04
Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
...
am: 9011149e19
2016-06-15 23:03:13 +00:00
Bert McMeen
9011149e19
Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs
2016-06-15 22:57:59 +00:00
Winson
511562ee23
Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
...
am: 9a75ed7ab5
2016-06-15 22:57:30 +00:00
Winson
34c5526dcd
Ensure that the tint is properly applied in docked mode.
...
- The signal cluster dedupes multiple calls with the same value, but
since the first calls come before the rotation relayout, the dark
tint is calculated incorrectly and subsequent calls get deduped.
Ensure that if the layout changes, we also update the tint of all
icons again.
Bug: 29390902
Change-Id: I79c3796cba2f9a94d44f9fd59cf1702a64b62cd9
2016-06-15 15:55:28 -07:00
TreeHugger Robot
9a75ed7ab5
Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev
2016-06-15 22:48:55 +00:00
Brad Ebinger
53a8774be1
Merge \"Handle Concurrency issues in Connection\" into nyc-dev
...
am: df41725e53
2016-06-15 22:44:46 +00:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:44:43 +00:00
Brad Ebinger
df41725e53
Merge "Handle Concurrency issues in Connection" into nyc-dev
2016-06-15 22:37:46 +00:00
Adam Lesinski
464bda8a2b
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
2016-06-15 22:35:26 +00:00
Andrew Solovay
4095ac603d
Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
...
am: 8e8fb7dda0
2016-06-15 21:42:20 +00:00
TreeHugger Robot
8e8fb7dda0
Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev
2016-06-15 21:36:05 +00:00
Android Build Merger (Role)
7f77a11aa8
Merge "Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4 am: 403aa6e3ec" into nyc-dev-plus-aosp
2016-06-15 21:22:25 +00:00
David Gross
09c0ebe4df
Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4
...
am: 403aa6e3ec
2016-06-15 21:21:16 +00:00
Brian Duddie
5ccbc93032
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
...
am: 9a31e8be48
2016-06-15 21:19:18 +00:00
Richard Ho
924b83540b
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
...
am: 07a375186e
2016-06-15 21:19:08 +00:00
David Gross
403aa6e3ec
Merge \"Delete simple reduction implementation.\"
...
am: e8909dc0f4
2016-06-15 21:11:19 +00:00
TreeHugger Robot
9a31e8be48
Merge "Send VR mode notification to AR app on context hub" into nyc-dev
2016-06-15 21:09:33 +00:00
Richard Ho
07a375186e
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev
2016-06-15 21:06:07 +00:00
Winson
7555f335f4
Fixing issue with screen pinning screen not showing for secondary users.
...
- Catch the exception when removing a view that is not yet attached.
This is not an issue because we are in the process of attaching it for
the first time anyways.
- Ensure that we post the calls from the secondary user in the main
thread for the system user. Especially since this calls through to
add the view for the new screen pinning window.
Bug: 29341417
Change-Id: If0e29a77ddb67426115f1d5d9f1adb580a1f07df
2016-06-15 14:01:58 -07:00
Jeff Davidson
4ff3bcfa0c
Fix runtime restart when using aggregated net observers.
...
When observing network traffic on a per-iface basis (as opposed to a
per-iface+uid basis), do not attempt to redistribute VPN traffic,
because it is unnecessary and will lead to a crash further down the
stack.
This is a one-line functional change, but some comments have been
added throughout to clarify behavior.
Bug: 29390363
Change-Id: Icca13f181d7698ca3ddc92aa9248f06f130d49a3
2016-06-15 13:55:56 -07:00
