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

272448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
c179797f8e Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d 
am: e62b36bb33

Change-Id: Icf35de6a5a0dcc356cce4cf5d183aed647f35cc6
 2016-07-06 13:21:51 +00:00
Erik Kline
e62b36bb33 Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev 
am: 58ef88927d

Change-Id: Ide0d1043f4047593c10dcb1a1e3ca5c644c6496c
 2016-07-06 13:15:47 +00:00
TreeHugger Robot
58ef88927d Merge "[net mgmt svc] add method to retrieve INetd reference" into nyc-mr1-dev 2016-07-06 13:09:42 +00:00
Erik Kline
4e37b70440 [net mgmt svc] add method to retrieve INetd reference 
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
 2016-07-06 19:32:01 +09:00
riddle_hsu
5b00144c68 Merge \\\\"MediaSession: Use mHandler for sending a pending intent\\\\" am: fcae61308c am: b417585b29 am: e76561980e 
am: 746320f1a8

Change-Id: I98ebb5592aad3e5d7896854511d296ad757cd599
 2016-07-06 08:28:46 +00:00
riddle_hsu
746320f1a8 Merge \\\"MediaSession: Use mHandler for sending a pending intent\\\" am: fcae61308c am: b417585b29 
am: e76561980e

Change-Id: I75e2b19c9851ccebe7cdb27829911cea1677b1b0
 2016-07-06 08:23:17 +00:00
riddle_hsu
e76561980e Merge \\"MediaSession: Use mHandler for sending a pending intent\\" am: fcae61308c 
am: b417585b29

Change-Id: I293c98a5a27db0afb537f15ee8ebe7f0755bab1e
 2016-07-06 08:18:16 +00:00
riddle_hsu
b417585b29 Merge \"MediaSession: Use mHandler for sending a pending intent\" 
am: fcae61308c

Change-Id: I60ab3a4a19426b7912658dfa6b7ebd20863adf72
 2016-07-06 08:10:06 +00:00
Jae Seo
368a664bda resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c am: 8575120faa 
am: a9f35e05a5

Change-Id: Ied672d5708bf23ad297ca3df46be2bb6650bc459
 2016-07-06 08:04:53 +00:00
Jae Seo
a9f35e05a5 resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c 
am: 8575120faa

Change-Id: I31939710a2e8b2accc5445048bc6c0376d1371e6
 2016-07-06 08:00:54 +00:00
Treehugger Robot
fcae61308c Merge "MediaSession: Use mHandler for sending a pending intent" 2016-07-06 07:58:53 +00:00
Jae Seo
8575120faa resolve merge conflicts of 5b6c034 to stage-aosp-master 
am: 5f5bd8848c

Change-Id: I4a2c518ff61f00d09efb92bd7da2e9bc477421f3
 2016-07-06 07:55:48 +00:00
Jae Seo
5f5bd8848c resolve merge conflicts of 5b6c034 to stage-aosp-master 
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
 2016-07-06 00:45:15 -07:00
Jae Seo
5b6c03415c Merge "Fix deadlock in MediaSessionService during getCurrentUser()" 2016-07-06 07:15:54 +00:00
TreeHugger Robot
5f76c3712f Merge "Add NonNull and Nullable annotations to MtpDevice." 2016-07-06 06:31:48 +00:00
Shibin George
c4f28a4196 Fix deadlock in MediaSessionService during getCurrentUser() 
SystemServiceMAnager.stopUser() acquires ActivityManagerService
lock first and then acquires MediaSessionService.mLock during
onStopUser(). MediaSessionService.onSwitchUser(), on the other
hand, acquires mLock first and ActivityManagerService lock next.
This is a potential deadlock situation which can be resolved by
moving getCurrentUser() out of synchronized block. This will
release mLock sooner and avoid the deadlock.

https://code.google.com/p/android/issues/detail?id=214469

Change-Id: Ieb4520d60af6ca38496ca933da0cd9ae096a9408
Signed-off-by: Shibin George <shibing@codeaurora.org>
 2016-07-06 05:00:43 +00:00
Bill Yi
6f916b65b2 Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 0a4315194d -s ours 
am: 4f174386a6  -s ours

Change-Id: Ic9cc01995a828f9ac8d92cdb236a2312659a2306
 2016-07-06 04:38:57 +00:00
Bill Yi
4f174386a6 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev 
am: 0a4315194d  -s ours

Change-Id: I5fec32a2824d652c96c7c2b9bb0db46c170bffa9
 2016-07-06 04:30:47 +00:00
TreeHugger Robot
0a4315194d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-06 04:14:46 +00:00
Bill Yi
0c1fe2a244 Import translations. DO NOT MERGE am: 4c78b8e544 -s ours am: 77a07ca30b -s ours 
am: d20b0ad358  -s ours

Change-Id: I1cab7c4fde26f40d8869a2a27783f9e3959a8a7f
 2016-07-06 04:10:31 +00:00
Bill Yi
14eafafaee Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5303849195 -s ours 
am: eec3e1a549  -s ours

Change-Id: Ie1385345dd4b66f86b27db3a5273e11ec1712f69
 2016-07-06 04:10:07 +00:00
Bill Yi
0bf1ee474d Import translations. DO NOT MERGE am: 1cd0497bc2 -s ours 
am: ed0386eb02  -s ours

Change-Id: I80c24262097bc779e41f079ca502a343e486759d
 2016-07-06 04:09:59 +00:00
Bill Yi
d20b0ad358 Import translations. DO NOT MERGE am: 4c78b8e544 -s ours 
am: 77a07ca30b  -s ours

Change-Id: I5096d1a3e0e3620b53f0d6c8bab2320d7bd3f583
 2016-07-06 03:56:55 +00:00
Bill Yi
eec3e1a549 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev 
am: 5303849195  -s ours

Change-Id: I27cb864d6240d9fb8440b249c180ac8ba835b2c0
 2016-07-06 03:56:50 +00:00
Bill Yi
ed0386eb02 Import translations. DO NOT MERGE 
am: 1cd0497bc2  -s ours

Change-Id: I0ee09dc0fcfdac540f71ec34f70633791dafc540
 2016-07-06 03:56:43 +00:00
Bill Yi
77a07ca30b Import translations. DO NOT MERGE 
am: 4c78b8e544  -s ours

Change-Id: Iccd725b45dc4a9e128bad1a7a28a48558eee4ea1
 2016-07-06 03:49:51 +00:00
TreeHugger Robot
5899965651 Merge "Import translations. DO NOT MERGE" 2016-07-06 03:26:59 +00:00
TreeHugger Robot
5725b5f9ec Merge "Import translations. DO NOT MERGE" 2016-07-06 03:26:38 +00:00
TreeHugger Robot
45d9b74e8b Merge "Import translations. DO NOT MERGE" 2016-07-06 03:26:20 +00:00
TreeHugger Robot
daab3bfcbb Merge "Import translations. DO NOT MERGE" 2016-07-06 03:26:11 +00:00
TreeHugger Robot
24356a41f4 Merge "Import translations. DO NOT MERGE" 2016-07-06 03:25:15 +00:00
TreeHugger Robot
f75397de1d Merge "Import translations. DO NOT MERGE" 2016-07-06 03:24:40 +00:00
TreeHugger Robot
5303849195 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-06 03:21:09 +00:00
TreeHugger Robot
28a554190d Merge "Import translations. DO NOT MERGE" 2016-07-06 03:18:26 +00:00
Bill Yi
5a238464dd Import translations. DO NOT MERGE 
Change-Id: If1956ac983530432b46246ee0a53bfdccd81fcb1
Auto-generated-cl: translation import
 2016-07-05 19:37:55 -07:00
Jin Seok Park
8c1a674879 Merge "ExifInterface: Update image length/width values" 2016-07-06 02:33:39 +00:00
Bill Yi
c38eaf7dd8 Import translations. DO NOT MERGE 
Change-Id: I131713286101cf16e4ddfd6dcf10ff7165c8a69c
Auto-generated-cl: translation import
 2016-07-05 18:40:57 -07:00
Sungsoo Lim
ed87a24db7 Merge "MediaBrowserService: Add a constant for suggestion keywords" 2016-07-06 00:12:02 +00:00
Bill Yi
1cd0497bc2 Import translations. DO NOT MERGE 
Change-Id: Ic110e666b92152c5280d96f51129c7ba0b53ef2e
Auto-generated-cl: translation import
 2016-07-05 14:35:11 -07:00
Bill Yi
d4286f5ce8 Import translations. DO NOT MERGE 
Change-Id: I95cfccce32e6cb1431bc2d700573b73f5f983210
Auto-generated-cl: translation import
 2016-07-05 14:21:42 -07:00
Bill Yi
4c78b8e544 Import translations. DO NOT MERGE 
Change-Id: Idf9776c5e49200e5880dd16b81e43ae095471caa
Auto-generated-cl: translation import
 2016-07-05 14:07:10 -07:00
Bill Yi
2a824d635a Import translations. DO NOT MERGE 
Change-Id: Iecbfb973538722055462e89e730f73c562a649bd
Auto-generated-cl: translation import
 2016-07-05 12:58:36 -07:00
Bill Yi
ab1d207bee Import translations. DO NOT MERGE 
Change-Id: I1e3cc64e158e9ddc2250103518078d5c950d62d8
Auto-generated-cl: translation import
 2016-07-05 12:53:53 -07:00
Bill Yi
d1241e5141 Import translations. DO NOT MERGE 
Change-Id: I0cb05a13abeb7a9a24d00422126bb55cea23c6d8
Auto-generated-cl: translation import
 2016-07-05 12:31:25 -07:00
Bill Yi
73863a9ef7 Import translations. DO NOT MERGE 
Change-Id: Ifdc4d79e3c9e3672735b3ef00dcb10e08e821826
Auto-generated-cl: translation import
 2016-07-05 12:28:57 -07:00
Bill Yi
9a90fb79cc Import translations. DO NOT MERGE 
Change-Id: I01a4941cb8cd66e787170817af1f1f916be65f61
Auto-generated-cl: translation import
 2016-07-05 12:05:38 -07:00
Bill Yi
7fa5d1d8d5 Import translations. DO NOT MERGE 
Change-Id: I96aac6c8e4d87f96fcb59e905c608ad63a645b0a
Auto-generated-cl: translation import
 2016-07-05 12:03:00 -07:00
Hugo Benichi
58caee56cf Merge \\"IpConn metrics: use @IntDef\\" into nyc-mr1-dev am: 018a205824 
am: 48d9a3d42f

Change-Id: I526e118a53f6402c1728df33c623d281c3ae3e79
 2016-07-05 15:02:04 +00:00
Hugo Benichi
48d9a3d42f Merge \"IpConn metrics: use @IntDef\" into nyc-mr1-dev 
am: 018a205824

Change-Id: Ie2b1fc7934ea51bd65a9f360fa3949c2f03afe01
 2016-07-05 14:51:02 +00:00
TreeHugger Robot
018a205824 Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev 2016-07-05 14:39:47 +00:00