Kenny Guy
c5947f8b76
Merge "Match non-crypto aware admins when registering."
2016-02-03 17:45:03 +00:00
Paul Jensen
8514a8131f
Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
...
am: 44307adcf3
* commit '44307adcf371bacad4de6925a9207bdbfdc6f874':
Android packet filtering program interpreter test & program generator
2016-02-03 17:12:47 +00:00
Paul Jensen
44307adcf3
Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
2016-02-03 16:48:43 +00:00
Paul Jensen
d38fb7662d
Android packet filtering program interpreter test & program generator
...
Change-Id: I17951bd6320b9eb3b6c43f2ae37f62c2025705c1
2016-02-03 10:19:13 -05:00
Erik Kline
3d51d8bacc
Ignore link properties updates when nothing actually changed.
...
am: 6076cb0b85
* commit '6076cb0b859185b075d3a70655afb192d68d0774':
Ignore link properties updates when nothing actually changed.
2016-02-03 14:37:11 +00:00
Erik Kline
d33e6232fe
Partial unification of DHCPv4 and static IPv4 configuration codepaths
...
am: 8deac7793c
* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
Partial unification of DHCPv4 and static IPv4 configuration codepaths
2016-02-03 14:29:32 +00:00
Kenny Guy
8c41a1c9bc
Match non-crypto aware admins when registering.
...
Profile owners are registered before the user is
started and unlocked, so we need to check for
components that aren't cryptoware when looking
for the admin.
Bug: 26924254
Change-Id: I61fca0a3d6e490ca6fea9a7bdc8f2c44efde74f2
2016-02-03 14:20:30 +00:00
Erik Kline
6076cb0b85
Ignore link properties updates when nothing actually changed.
...
Change-Id: Ia3c0a652cb3b67707a5c5a0bb40f991ef1e6f777
2016-02-03 22:42:54 +09:00
Erik Kline
8deac7793c
Partial unification of DHCPv4 and static IPv4 configuration codepaths
...
Change-Id: Ic796f9b7bb853a332175c34e0f557588efb6247a
2016-02-03 22:42:53 +09:00
Erik Kline
0c96d715c1
Move DHCPv4 mechanics into IpManager
...
am: 8afa558c52
* commit '8afa558c527b4be4e0e489b17485577e23148636':
Move DHCPv4 mechanics into IpManager
2016-02-03 08:44:13 +00:00
Erik Kline
8afa558c52
Move DHCPv4 mechanics into IpManager
...
Bug: 17345682
Change-Id: I2c3d9d665ff3c38f02084c0cf86cd76035e7b0aa
2016-02-03 17:23:45 +09:00
Wale Ogunwale
45a551168a
Merge "Window resize reporting improvement when docked stack is created"
2016-02-03 03:25:59 +00:00
Wale Ogunwale
961f4858f2
Window resize reporting improvement when docked stack is created
...
There were a few issues with window resize reporting when a docked
stack is created that caused the client to get frames for fulscreen
even though the task was in split-screen mode.
- Ignore docked stack visibility when get bounds for other stack when
resizing due to docked stack.
- Immediately resize all other stacks in activity manager when the
docked stack is attached to the display.
- Defer surface layouts for the uncheck portion of moving a task to a
stack.
- Don't perform layout of all windows on a display when a stack is
attached to the display since it doesn't have any windows yet.
Bug: 26861802
Change-Id: I2c7f31153da48618e90607c98ec5b29492b6ef38
2016-02-02 19:19:04 -08:00
Wale Ogunwale
96c692ab31
Merge "Improved timing of when system sends multi-window change event to app"
2016-02-03 03:15:16 +00:00
Wale Ogunwale
22e2526b64
Improved timing of when system sends multi-window change event to app
...
We were previously sending multi-window/PiP mode changed events to
apps once the task config is changed in activity manager.
However, the actual changing of the multi-windowing or PiP mode
might not be fully complete when the app receives the event so they
might be wrong state information they query for like currnet config.
We now schedule the events to be send once the current transaction
cycle is done.
Bug: 26877409
Change-Id: I393b56035bb4197f99b3db3d27c0599835b5f86c
2016-02-02 19:07:01 -08:00
Lifu Tang
d7a4da42bd
Merge changes from topic 'API renaming'
...
* changes:
Worked around the crash caused by API renaming
Rename Gps to Gnss for measurement-related APIs
2016-02-03 02:08:28 +00:00
Makoto Onuki
a0fddc1ed4
Merge "Ignore unknown user restrictions and WTF instead."
2016-02-03 01:38:33 +00:00
Makoto Onuki
cd6a48542a
Merge "Slightly change the "pre-N" so it's CTS-friendly."
2016-02-03 01:31:24 +00:00
Makoto Onuki
939be87776
Slightly change the "pre-N" so it's CTS-friendly.
...
Right now, the value of VERSION_CODES.N is 10000, but I'm writing
a caller app with target SDK level 24 for CTS, and the previous
logic didn't work for it.
Bug 25506830
Change-Id: I73613f30b437fb19406736f897d01d59b1f84c9d
2016-02-02 17:24:59 -08:00
Jim Miller
7b5e869730
Merge "Add new icon for fbe notification"
2016-02-03 01:12:36 +00:00
Makoto Onuki
1f1ceef0f8
Ignore unknown user restrictions and WTF instead.
...
Bug 23902097
Change-Id: I1ac147ecd0286a8eb674d6f9f527edfea6e1198e
2016-02-02 17:10:41 -08:00
Jim Miller
b1135b7196
Add new icon for fbe notification
...
Fixes bug 26863369
Change-Id: I967d585fa251782d18a5f24c025b28d40268dc85
2016-02-02 17:08:56 -08:00
Filip Gruszczynski
ab28afd3df
Merge "Animate pinned stack resize when launching acivity with new bounds."
2016-02-03 00:16:05 +00:00
Lifu Tang
818aa2c2c4
Rename Gps to Gnss for measurement-related APIs
...
Bug: 26895757
Change-Id: I12d89dc251e356cf976a4bcd3589a8925a8ad745
2016-02-02 16:15:03 -08:00
Felipe Leme
f933871976
Merge "Created a ACTION_RESTRICT_BACKGROUND_CHANGED intent."
2016-02-02 23:59:30 +00:00
Chong Zhang
3bf163e783
Merge "Don't clear mExiting if window is going to be removed."
2016-02-02 23:31:38 +00:00
Filip Gruszczynski
47dae5850d
Animate pinned stack resize when launching acivity with new bounds.
...
Bug: 25672053
Change-Id: Idbcbb77c2442d5e35041f757489f0657daad48c9
2016-02-02 15:27:15 -08:00
Carlos Valdivia
bf33bd4d31
Revert "Permissions: Get rid of GET_ACCOUNTS"
...
This reverts commit 918c55a67c2bf0cec79f75dec6ca468e914a5fd1.
Change-Id: I995f134336bf61ac1f21052355900ae89d0d6694
2016-02-02 15:01:56 -08:00
Makoto Onuki
e3936dcf03
Merge "DO / PO Shouldn't be removed as active admin..."
2016-02-02 22:55:48 +00:00
Makoto Onuki
90b896533e
DO / PO Shouldn't be removed as active admin...
...
even if they asked.
Also clear(Device|Profile)Owner should remove them as the active admin
too.
Also add some more unit tests.
Bug 26858840
Change-Id: I7b3ed92e1b4cbe803381ed6e3f64d8de17b2ebb0
2016-02-02 14:54:06 -08:00
Chong Zhang
6bb8250e1b
Don't clear mExiting if window is going to be removed.
...
bug: 26819496
Change-Id: I7ab1f45f8d32bc086ded579b46b6b5e9b32771a0
2016-02-02 14:14:57 -08:00
Chris Tate
6dfb9b394d
Merge "Start the sync job service after primary boot"
2016-02-02 21:34:39 +00:00
Christopher Tate
734c91de58
Start the sync job service after primary boot
...
This avoids starting the "timeout?" clock until the system's main looper
thread is ready to actually process service startup, avoiding spurious
ANR reports.
Bug 26922408
Change-Id: I8fd3f20e4af644a933f1318e623096b73c7e8e08
2016-02-02 12:49:35 -08:00
Julia Reynolds
b9427f34d8
Merge "Allowing querying for apps with blocked topics."
2016-02-02 19:44:55 +00:00
Rubin Xu
95bde8ea53
Merge "Call SecurityLog methods via Injector"
2016-02-02 19:42:12 +00:00
Zach Kuznia
7647b678c2
Merge "Make AccessibilityGestureDetector handle gesture detection start and end."
2016-02-02 18:31:35 +00:00
Chong Zhang
76e9d1d4be
Merge "Transfer focus from the current focused window for two-finger scroll"
2016-02-02 18:10:18 +00:00
Rubin Xu
49caead1c2
Call SecurityLog methods via Injector
...
This is to make sure the unit test can mock them out.
Bug: 26911599
Change-Id: I07a1a8b43ad5716a4b667bc5266b3b03997268c5
2016-02-02 18:00:28 +00:00
Julia Reynolds
dd3e86bcb0
Allowing querying for apps with blocked topics.
...
Bug: 26882239
Change-Id: If888cb18891a412067bcb28e575f502c6091f77a
2016-02-02 12:51:06 -05:00
Andreas Gampe
fe54b11803
Merge "Frameworks/base: Add A/B OTA preopting"
2016-02-02 16:01:11 +00:00
Victor Chang
fe13c5fbe1
Merge "Fix that can't launch managed QuickContact in ContactSearch"
2016-02-02 11:02:07 +00:00
Daichi Hirono
10c3d3f666
Merge "Mount appfuse in process namespace."
2016-02-02 10:14:27 +00:00
Narayan Kamath
2a27769654
Merge "Alarm: add missing closedir after opendir when searching for RTC" am: 21b2b7306e
...
am: 7b33488e12
* commit '7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b':
Alarm: add missing closedir after opendir when searching for RTC
2016-02-02 09:41:12 +00:00
Narayan Kamath
7b33488e12
Merge "Alarm: add missing closedir after opendir when searching for RTC"
...
am: 21b2b7306e
* commit '21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
Alarm: add missing closedir after opendir when searching for RTC
2016-02-02 09:36:55 +00:00
Mykola Kondratenko
e45abfa083
Alarm: add missing closedir after opendir when searching for RTC
...
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().
Fix degrade introduced by Google commit 0eb58268.
Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
2016-02-02 09:30:50 +00:00
Erik Kline
59235e66a5
Support static IP configuration internally
...
am: 1e91e4ebb6
* commit '1e91e4ebb65e63969e6ae45503257852be017aee':
Support static IP configuration internally
2016-02-02 04:07:58 +00:00
Zachary Kuznia
9254b3e336
Make AccessibilityGestureDetector handle gesture detection start and end.
...
Change-Id: I2c1861d5d6c5c0dc921e62f03ee6283f1f7a62b6
2016-02-01 19:28:33 -08:00
Tim Murray
086e09ff60
Merge "Add specific category for TOP_APP in ActivityManager."
2016-02-02 02:13:33 +00:00
Chong Zhang
ecb44a328c
Transfer focus from the current focused window for two-finger scroll
...
When doing the two-finger scroll, we resize based on the main window.
However, the main window might not have focus (eg. diaglog displayed
on top). We need to grab focus from the window that actually has focus.
bug: 26604036
Change-Id: I05d0ed95c59901c925e242d4b9a856d1ca0a55f3
2016-02-01 18:08:03 -08:00
Selim Gurun
0829fd4b26
Merge "Run 32-bit app in multiArch APK."
2016-02-01 23:40:23 +00:00