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

294971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
77323eb2bd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours 
am: 3b99360472  -s ours

Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7
 2016-11-02 13:11:18 +00:00
Nimrod Gileadi
a774e10aec Increment a MetricsLogger counter on back press. am: 580135c1b8 
am: 51ac3a911c

Change-Id: I0b65ca68a743828fa47efd6793c5873cbc9b74a9
 2016-11-02 13:10:36 +00:00
Bill Yi
70d5453b63 Import translations. DO NOT MERGE am: 7d24dd6448 -s ours 
am: 1aa04e8cae  -s ours

Change-Id: I0957749f702aa34c7ef447e4995e2ae23e1748a1
 2016-11-02 13:10:22 +00:00
Bill Yi
c990515546 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f750173bf1 -s ours 
am: 015687b026  -s ours

Change-Id: Id92fa9ff612c16f45cd20978b53f81adf85ef6f1
 2016-11-02 13:08:32 +00:00
Bill Yi
4c58e001a2 Import translations. DO NOT MERGE am: 212cda9a9a -s ours 
am: e2dac2cd85  -s ours

Change-Id: I2ae406406b26f10c863eda8338e1c68da30754b7
 2016-11-02 13:07:29 +00:00
Bill Yi
80914e10e5 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 7ba7f49030  -s ours

Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895
 2016-11-02 13:04:36 +00:00
Bill Yi
9e7ac87d08 Import translations. DO NOT MERGE 
am: 6fb3b77745  -s ours

Change-Id: Id6c5d0487f362fed25ddf6379f44db9b2ad60a1c
 2016-11-02 13:04:35 +00:00
Nimrod Gileadi
2c2abe6db3 Merge "Increment a MetricsLogger counter on back press." into cw-f-dev 
am: 523c4fd695

Change-Id: I2928fafd79f08500c7369691985f6b8b726433c1
 2016-11-02 13:03:07 +00:00
Bill Yi
3b99360472 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 125deebf5d  -s ours

Change-Id: Ic90df3a0db800052813e23370e1b80846caae456
 2016-11-02 13:03:04 +00:00
Nimrod Gileadi
51ac3a911c Increment a MetricsLogger counter on back press. 
am: 580135c1b8

Change-Id: I29fb7f03b5da8edf3643118bc74bba553f2f6ca1
 2016-11-02 13:03:04 +00:00
Bill Yi
015687b026 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: f750173bf1  -s ours

Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d
 2016-11-02 13:03:03 +00:00
Bill Yi
1aa04e8cae Import translations. DO NOT MERGE 
am: 7d24dd6448  -s ours

Change-Id: Iadd9f2dcec4c026a70aa5169325a6d3e42d15460
 2016-11-02 13:03:03 +00:00
Bill Yi
e2dac2cd85 Import translations. DO NOT MERGE 
am: 212cda9a9a  -s ours

Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae
 2016-11-02 13:03:00 +00:00
TreeHugger Robot
1a0b637f19 Merge "Import translations. DO NOT MERGE" 2016-11-02 12:58:39 +00:00
TreeHugger Robot
f750173bf1 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2016-11-02 12:58:15 +00:00
TreeHugger Robot
125deebf5d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-11-02 12:57:34 +00:00
TreeHugger Robot
7ba7f49030 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-11-02 12:57:06 +00:00
TreeHugger Robot
217ccca15b Merge "Import translations. DO NOT MERGE" 2016-11-02 12:56:22 +00:00
TreeHugger Robot
523c4fd695 Merge "Increment a MetricsLogger counter on back press." into cw-f-dev 2016-11-02 12:55:17 +00:00
Hugo Benichi
790815453d Merge "ApfTest: tag tests with @SmallTest or @MediumTest" 2016-11-02 12:35:48 +00:00
TreeHugger Robot
fc686becb9 Merge "Cross profile candidate should be considered" 2016-11-02 12:13:30 +00:00
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
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