Commit Graph

301953 Commits

Author SHA1 Message Date
TreeHugger Robot
3694d8789f Merge "[DPM] DO can start network logging and listen for events" 2016-11-02 10:35:28 +00:00
Tony Mak
9f2c93663c Cross profile candidate should be considered
Bug: 32547783

Fixed the regression introduced in ag/1243573

Test: Manual test - Open a map link in work calendar, personal map is shown as an option.

Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
2016-11-02 10:26:45 +00:00
Tony Mak
d3986be5e4 Add javadoc for profileGroupId
According to the implementation of getProfileParent,
profileGroupId == parent user id.

And we have already assumed this is true in some part of code in DPMS.

Test: Javadocs change

Change-Id: Ie48fdf24fb0428d4ee3f09bed2ac26cb17e1ced9
2016-11-02 10:18:01 +00:00
Michal Karpinski
f77ee4f1b7 [DPM] Management and retrieval of network logs
This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2
2016-11-02 09:00:21 +00:00
Michal Karpinski
dd9bb4fdd9 [DPM] DO can start network logging and listen for events
This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).

Bug: 29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47
2016-11-02 08:52:53 +00:00
Bill Yi
fab22f7db6 Import translations. DO NOT MERGE
Change-Id: I2c811c3ef881581b47d410c916e43160e6d60a53
Auto-generated-cl: translation import
2016-11-01 23:30:37 -07:00
Sudheer Shanka
34b33887a1 Fix IMountService transaction ids.
- (IBinder.FIRST_CALL_TRANSACTION=1) is added to the specified
  transaction codes during binder generation. Correct the
  IMountService transaction ids taking this into account.
- Update interface descriptors in MountService related native code.
- Add proxy implementations for IMountServiceListener and
  IMountShutdownObserver.

Bug: 30977067
Test: Verified that calls from native code to IMountService system
      service are working and listeners in native code can get the
      callbacks correctly.
Change-Id: I9bef9a8113e92d8b36e963bd961ac858acac3f2a
2016-11-01 23:29:33 -07:00
Hugo Benichi
4195c28347 ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.

Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.

Test: ApfTest passes ($runtest frameworks-net)
Bug: 31479480
Change-Id: Iae28fc30b6229a161388233c40863f38b902991d
2016-11-02 15:12:35 +09:00
TreeHugger Robot
c4e678e7df Merge "Add findPath method to MtpDocumentsProvider." 2016-11-02 05:18:29 +00:00
Daichi Hirono
b9ffa2a1d2 Add findPath method to MtpDocumentsProvider.
Bug: 32515515
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: Ib87e8f5258de8fd48a099adbf077b3b9ff85773c
2016-11-02 12:33:45 +09:00
Bill Yi
6fb3b77745 Import translations. DO NOT MERGE
Change-Id: I5b2c1dbb250552bbd446e51b38be6b9508d2bf0c
Auto-generated-cl: translation import
2016-11-01 19:34:21 -07:00
Jorim Jaggi
5974b4df49 Merge changes from topic 'keyguard_refactor'
* changes:
  The big keyguard transition refactor (6/n)
  The big keyguard transition refactor (5/n)
  The big keyguard transition refactor (4/n)
  The big keyguard transition refactor (3/n)
  The big keyguard transition refactor (2/n)
  The big keyguard transition refactor (1/n)
2016-11-02 02:14:15 +00:00
pengzhicai
7c30bb8e0f Fix String is empty issue
Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
2016-11-02 09:42:44 +08:00
Yorke Lee
ce55e84315 Merge "Add a config flag to control app transitions" 2016-11-02 01:38:52 +00:00
Sanket Agarwal
a4447cc1b6 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e am: f41abccf80 am: 5e8b2e4110
am: 15c21c616e

Change-Id: I15a7590c66fed5061ead0046e0773454911a43aa
2016-11-02 01:27:13 +00:00
Joseph Pirozzo
22eedd9073 MAP MCE am: b8fc0679e8 am: b13240028b am: 5602b26f41
am: 132dab26e5

Change-Id: Icb6d7db9d0e1866b2c1847be2b1da0008bd8185d
2016-11-02 01:26:01 +00:00
Joseph Pirozzo
d53cdd2b6d Pbap disconnect durring connect am: a4f0127fbb am: a31933abc3 am: 1c21f0378a
am: 89c1087162

Change-Id: I879ec1f919386efb433d21e2bc7088e3ed31f4ce
2016-11-02 01:25:15 +00:00
Joseph Pirozzo
fe9368afe8 MAP MCE am: 631768d814 am: d94c280a7f am: c412914520
am: fb70d77f64

Change-Id: Ia56f6ca01a4d92b24f192102917950a10b6cb05d
2016-11-02 01:24:14 +00:00
Julia Reynolds
73481c8837 Merge "Some channel model updates" 2016-11-02 01:20:20 +00:00
Sanket Agarwal
15c21c616e Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e am: f41abccf80
am: 5e8b2e4110

Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6
2016-11-02 01:19:29 +00:00
Joseph Pirozzo
132dab26e5 MAP MCE am: b8fc0679e8 am: b13240028b
am: 5602b26f41

Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
2016-11-02 01:18:38 +00:00
Joseph Pirozzo
89c1087162 Pbap disconnect durring connect am: a4f0127fbb am: a31933abc3
am: 1c21f0378a

Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96
2016-11-02 01:17:45 +00:00
Joseph Pirozzo
fb70d77f64 MAP MCE am: 631768d814 am: d94c280a7f
am: c412914520

Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
2016-11-02 01:16:45 +00:00
Sanket Agarwal
5e8b2e4110 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e
am: f41abccf80

Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
2016-11-02 01:11:53 +00:00
Joseph Pirozzo
5602b26f41 MAP MCE am: b8fc0679e8
am: b13240028b

Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
2016-11-02 01:11:04 +00:00
Joseph Pirozzo
1c21f0378a Pbap disconnect durring connect am: a4f0127fbb
am: a31933abc3

Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
2016-11-02 01:10:02 +00:00
Joseph Pirozzo
c412914520 MAP MCE am: 631768d814
am: d94c280a7f

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
2016-11-02 01:09:14 +00:00
Sanket Agarwal
f41abccf80 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am: cf4dc9236e

Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
2016-11-02 01:05:20 +00:00
Joseph Pirozzo
b13240028b MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
2016-11-02 01:05:14 +00:00
Joseph Pirozzo
a31933abc3 Pbap disconnect durring connect
am: a4f0127fbb

Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
2016-11-02 01:04:33 +00:00
Joseph Pirozzo
d94c280a7f MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
2016-11-02 01:03:51 +00:00
Bill Yi
212cda9a9a Import translations. DO NOT MERGE
Change-Id: Ief73e3fee1a3f44096c534437fd74b357a2dde8a
Auto-generated-cl: translation import
2016-11-01 17:57:21 -07:00
Sanket Agarwal
cf4dc9236e Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
* changes:
  MAP MCE
  Pbap disconnect durring connect
  MAP MCE
2016-11-02 00:55:40 +00:00
Adrian Roos
6154da805a Merge "DozeService: Fixup nits from review" 2016-11-02 00:54:49 +00:00
Fyodor Kupolov
0624b7b164 Merge "Initialize daemon on a separate thread" 2016-11-02 00:54:07 +00:00
Tomasz Mikolajewski
1a9acd63ed Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92 am: de915e3ade
am: d771ca3871

Change-Id: I9bf6a015e90e3e259897ca0b4ff29c69e13feae6
2016-11-02 00:49:44 +00:00
Bill Yi
7d24dd6448 Import translations. DO NOT MERGE
Change-Id: I22df3420e521f99e68d025264954a102f14990df
Auto-generated-cl: translation import
2016-11-01 17:45:25 -07:00
Tomasz Mikolajewski
d771ca3871 Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92
am: de915e3ade

Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
2016-11-02 00:44:47 +00:00
Tomasz Mikolajewski
de915e3ade Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7
am: 4c65d49a92

Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
2016-11-02 00:39:45 +00:00
Joseph Pirozzo
b8fc0679e8 MAP MCE
Fix @LINK to @link in javadoc.

Bug: 30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit f5fba751d360bbe8294c4640f5ad12a990f13122)
2016-11-01 17:39:16 -07:00
Joseph Pirozzo
a4f0127fbb Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.

bug: 28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit bdd24942e47811ffe6bb9814934e6b08a8190e7e)
2016-11-01 17:39:16 -07:00
Joseph Pirozzo
631768d814 MAP MCE
Add MAP client code into packages/apps/Bluetooth.  Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).

Bug: 30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)
2016-11-01 17:39:16 -07:00
Tomasz Mikolajewski
4c65d49a92 Merge "Add support for opening JAR/ZIP files via FD."
am: 7f64c195f7

Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
2016-11-02 00:34:47 +00:00
TreeHugger Robot
9717839a1f Merge "Revert "Exit enteringAccessoryMode when entered."" 2016-11-02 00:29:27 +00:00
Dianne Hackborn
32f40ee1a2 Implement Binder shell command for settings provider.
The provider now published a system service, through which you
can do direct shell commands.  The commands are a copy of what
the existing "settings" command does (in a follow-up, that will
be converted to a simple script that calls this).

Also improved a few things in the provider:

- Don't allow implicit creation of settings data for users that
don't exist.
- Improve dump to include the package name that applied each setting
and remove misleading stuff from historical data (and this is now
available through "dumpsys settings" instead of the provider dump).

Test: manual

Change-Id: Id9aaeddc76cca4629d04cbdcbba6a311e942dfa6
2016-11-01 17:25:57 -07:00
Tomasz Mikolajewski
7f64c195f7 Merge "Add support for opening JAR/ZIP files via FD." 2016-11-02 00:24:07 +00:00
Fyodor Kupolov
6e99d3f044 Do not exclude partial users that are not being removed
Otherwise maxSupportedUsers limit can be exceeded by creating users in
parallel.

Test: Manual cmd line + UI guest create/switch/remove + UserManagerTest
Bug: 32485535
Change-Id: I490a70501f3643980bbfb1c95940b9ae3f20ccee
2016-11-01 17:18:59 -07:00
Bill Yi
e47fe6863c Import translations. DO NOT MERGE
Change-Id: Ia1e32a6765f35a781a05e767a219399ec159fddc
Auto-generated-cl: translation import
2016-11-01 17:18:13 -07:00
Dianne Hackborn
2e8288f450 Merge "Switch am command to go through "cmd activity"." 2016-11-02 00:11:28 +00:00
Yorke Lee
044e2aef39 Add a config flag to control app transitions
Bug: 32289964
Test: Build and verify that app transitions still work
and can be controlled by overlay

Cherry-picked from I78e88c4e7d3c32493c11be451b0c5ca59f68be83
Change-Id: I78e88c4e7d3c32493c11be451b0c5ca59f68be83
2016-11-01 16:48:28 -07:00