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

315550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tadashi G. Takaoka
53042fc5b2 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev am: d280bfea23 
am: 6c8c498b5b

Change-Id: I2da5392ab850cdf9053cfd16d216feffe9afada5
 2017-04-13 08:03:37 +00:00
Tadashi G. Takaoka
6c8c498b5b Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 
am: d280bfea23

Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
 2017-04-13 07:53:39 +00:00
Tadashi G. Takaoka
d280bfea23 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 2017-04-13 07:41:34 +00:00
Robert Carr
4684ba6c9e Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev am: 9d5ac93cc3 
am: b3871981f2

Change-Id: I2b413c9ba1d36fc8f8b3dffedf72331de82a4b40
 2017-04-13 07:34:22 +00:00
Robert Carr
b3871981f2 Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev 
am: 9d5ac93cc3

Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
 2017-04-13 07:22:01 +00:00
TreeHugger Robot
9d5ac93cc3 Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev 2017-04-13 07:12:55 +00:00
Dan Sandler
15715786ff Merge "Minor text fixes." into oc-dev am: 818c408e5d 
am: ba7435fd81

Change-Id: Id5bac5e8654e55d03835bdf5dc660d5985d67cbc
 2017-04-13 07:10:34 +00:00
Android Build Merger (Role)
380163d475 Merge "Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f am: cb276fa531" 2017-04-13 07:07:58 +00:00
Adam Lesinski
d68c11b573 Merge "AAPT2: Generate R.txt" into oc-dev am: d1a6e6740f 
am: cb276fa531

Change-Id: I199b76e76a9ed5d4e79ec54830060779eb27c548
 2017-04-13 07:07:15 +00:00
Android Build Merger (Role)
7eac72a86a Merge "Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02 am: 49f1db32ef" 2017-04-13 07:06:55 +00:00
Michael Wright
8f072af76d Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02 
am: 49f1db32ef

Change-Id: If9510872fe549d06a4f2cdef6c96862f5dfd4127
 2017-04-13 07:06:11 +00:00
Android Build Merger (Role)
72a45681d7 Merge "Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am: 4ad2ebcc90 am: 3395e15204" 2017-04-13 07:05:48 +00:00
TreeHugger Robot
36fd86fa09 Merge "expose visibility of PbapClientProfile. The use case is that the Car head unit will be consuming the data instead of providing it" 2017-04-13 07:05:30 +00:00
Dan Sandler
ba7435fd81 Merge "Minor text fixes." into oc-dev 
am: 818c408e5d

Change-Id: I344ae2f6456893defd49d9efe5af8325770bcf83
 2017-04-13 07:05:05 +00:00
Adam Lesinski
a23489806a Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am: 4ad2ebcc90 
am: 3395e15204

Change-Id: I983cee532196a5cd9a16fb65a2007a155428256c
 2017-04-13 07:04:57 +00:00
TreeHugger Robot
818c408e5d Merge "Minor text fixes." into oc-dev 2017-04-13 07:00:57 +00:00
Adam Lesinski
cb276fa531 Merge "AAPT2: Generate R.txt" into oc-dev 
am: d1a6e6740f

Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
 2017-04-13 06:59:33 +00:00
Michael Wright
49f1db32ef Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev 
am: 07d60cce02

Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
 2017-04-13 06:55:21 +00:00
Adam Lesinski
3395e15204 Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev 
am: 4ad2ebcc90

Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
 2017-04-13 06:54:21 +00:00
TreeHugger Robot
d1a6e6740f Merge "AAPT2: Generate R.txt" into oc-dev 2017-04-13 06:54:21 +00:00
TreeHugger Robot
07d60cce02 Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev 2017-04-13 06:48:29 +00:00
Chong Zhang
5ad4b40999 Merge changes from topic 'api-review' into oc-dev am: fd89a95f35 
am: 847beba350

Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
 2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948 MediaCas: address comments for API reviews am: addc39ec27 
am: e0c465fefa

Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
 2017-04-13 06:43:36 +00:00
TreeHugger Robot
4ad2ebcc90 Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev 2017-04-13 06:42:52 +00:00
Chong Zhang
847beba350 Merge changes from topic 'api-review' into oc-dev 
am: fd89a95f35

Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
 2017-04-13 06:34:25 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews 
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
 2017-04-13 06:32:28 +00:00
Erik Kline
4b7af54762 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca am: 1d3528ba86 
am: 23c0170352

Change-Id: I1f99a5fdcf2285a2579610d1eb0a946d21043e3d
 2017-04-13 06:25:02 +00:00
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev 
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
 2017-04-13 06:23:51 +00:00
Erik Kline
23c0170352 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c am: 1303b8b9ca 
am: 1d3528ba86

Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
 2017-04-13 06:18:38 +00:00
Erik Kline
1d3528ba86 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c 
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
 2017-04-13 06:12:30 +00:00
Erik Kline
1303b8b9ca Merge "Ignore potential SystemProperties errors when setting net.dns" 
am: f854c9034c

Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
 2017-04-13 06:00:37 +00:00
Lorenzo Colitti
7586a5e4bc Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 am: 997e6b085a 
am: 42f7ca684c

Change-Id: I94265917ea58b78c3ee56ee89f99c0af307b7fe2
 2017-04-13 05:54:27 +00:00
Treehugger Robot
f854c9034c Merge "Ignore potential SystemProperties errors when setting net.dns" 2017-04-13 05:49:31 +00:00
Lorenzo Colitti
42f7ca684c Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2 
am: 997e6b085a

Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
 2017-04-13 05:48:37 +00:00
Lorenzo Colitti
997e6b085a Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b 
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
 2017-04-13 05:37:01 +00:00
Lorenzo Colitti
67401e25c2 Merge "Move some NetworkStats tests to tests/net." 
am: ab3901dc8b

Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
 2017-04-13 05:29:58 +00:00
Lorenzo Colitti
ab3901dc8b Merge "Move some NetworkStats tests to tests/net." 2017-04-13 05:18:47 +00:00
Daichi Hirono
a5e04889ee Merge "Use Context#startForegroundService in MTP provider" into oc-dev am: 96907e6553 
am: 1737e10334

Change-Id: I9eba75fb2af47cccb2bec9d71adc258bb5296ebd
 2017-04-13 04:47:53 +00:00
Daichi Hirono
1737e10334 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 
am: 96907e6553

Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
 2017-04-13 04:42:22 +00:00
Robert Carr
af422a8c5b Stack APPLICATION_MEDIA_OVERLAY windows with relative layering. 
See accompanying frameworks/native commit
 "SurfaceFlinger: Add parent-less relative layering" for a full explanation.

Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug: 36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
 2017-04-12 21:40:30 -07:00
TreeHugger Robot
96907e6553 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 2017-04-13 04:36:50 +00:00
Fyodor Kupolov
0c48ce1309 Merge "Report app data fixup and prepare timings" into oc-dev am: 1423ea3a45 
am: 9f3cf1a692

Change-Id: I81dfcf98097d356e53994ba7ffaf247618349304
 2017-04-13 04:24:51 +00:00
Erik Kline
4edba01eb4 Ignore potential SystemProperties errors when setting net.dns 
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
 2017-04-13 13:16:22 +09:00
Fyodor Kupolov
9f3cf1a692 Merge "Report app data fixup and prepare timings" into oc-dev 
am: 1423ea3a45

Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
 2017-04-13 04:13:44 +00:00
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Vladislav Kaznacheev
ee10f27cbe Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc 
am: 2679fe4e95

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
 2017-04-13 03:57:09 +00:00
Vladislav Kaznacheev
2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 
am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc
 2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 2017-04-13 03:36:30 +00:00
Jocelyn Dang
6306035a26 Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev am: 78b3b2308c 
am: ae624f3f0b

Change-Id: Ibae7b4256adfdf9265d68dffbb5189326342471e
 2017-04-13 03:08:46 +00:00
Jocelyn Dang
ae624f3f0b Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 
am: 78b3b2308c

Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
 2017-04-13 02:58:37 +00:00