Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
530a1559ea Merge changes Ie0f24598,If49c1b0b 
* changes:
  Reduce object allocations in WM in some frequently called methods
  Introduced WindowContainer.mConsumerWrapperPool
 2016-12-07 03:54:38 +00:00
Felipe Leme
93ed9d5f12 Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev am: d95fc2d4c9 
am: 5bf4bbea8e

Change-Id: I1e8cb959c31cd4feda3d53414fbc283126df19ca
 2016-12-07 02:36:40 +00:00
Felipe Leme
761ee08e0a Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission. am: 965f4265c5 
am: 519cb74e92

Change-Id: I988f82958648d6e141e3c161f6e7e72346d0a818
 2016-12-07 02:35:42 +00:00
Andreas Gampe
82284a176d Merge "Workaround for javac compilation issue of lambda code" am: 90e5fc0970 am: 1c1782cb06 am: 9d267851b8 
am: 4299191060

Change-Id: I849032d9b56c4a1c22ea7f33fe3787db876e1aac
 2016-12-07 02:31:49 +00:00
Felipe Leme
5bf4bbea8e Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev 
am: d95fc2d4c9

Change-Id: I1897900ed10da2adcb49f144b549044f46e530ba
 2016-12-07 02:31:47 +00:00
Felipe Leme
519cb74e92 Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission. 
am: 965f4265c5

Change-Id: Ib7380a343f55e262c2df61d7ad9fc9e8e959a7b7
 2016-12-07 02:31:41 +00:00
Andreas Gampe
4299191060 Merge "Workaround for javac compilation issue of lambda code" am: 90e5fc0970 am: 1c1782cb06 
am: 9d267851b8

Change-Id: Ib7783ecd435367b8e2d0a75b1f982818cde681f5
 2016-12-07 02:27:41 +00:00
TreeHugger Robot
d95fc2d4c9 Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev 2016-12-07 02:24:42 +00:00
Andreas Gampe
9d267851b8 Merge "Workaround for javac compilation issue of lambda code" am: 90e5fc0970 
am: 1c1782cb06

Change-Id: Ic766abed3d5b2cd2cce4f011667c0df8cc7b0ea0
 2016-12-07 02:19:52 +00:00
Andreas Gampe
1c1782cb06 Merge "Workaround for javac compilation issue of lambda code" 
am: 90e5fc0970

Change-Id: Ie7f376587c793ef9312626e41ee4be40f66de5f4
 2016-12-07 02:12:39 +00:00
Tomasz Mikolajewski
6c686c4dd3 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d am: 15cd392108 am: 3199d58939 
am: 37541865f3

Change-Id: Iae24b046178c00e4e8cda7ee1dc25c993ef38c0b
 2016-12-07 02:09:12 +00:00
Andreas Gampe
90e5fc0970 Merge "Workaround for javac compilation issue of lambda code" 2016-12-07 02:05:08 +00:00
Tomasz Mikolajewski
37541865f3 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d am: 15cd392108 
am: 3199d58939

Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596
 2016-12-07 02:01:12 +00:00
Tomasz Mikolajewski
3199d58939 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d 
am: 15cd392108

Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47
 2016-12-07 01:54:13 +00:00
Jeff Sharkey
019ac85ef5 Move more installd methods to Binder. 
Test: builds, boots, apps install fine
Bug: 13758960, 30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
 2016-12-06 18:52:20 -07:00
Jeremy Joslin
c2f084e18f Merge "Adding a new string array resource for network recommendations." am: 54710df28d am: ea968e411c -s ours am: 472d5ecb5f -s ours 
am: 9347a4f38f  -s ours

Change-Id: I14d558a02bfd5617e0e04427e23bc2c4f000d88f
 2016-12-07 01:50:17 +00:00
Tomasz Mikolajewski
15cd392108 Merge "Fix crashing StrictJarFile due to doubled closing." 
am: 68ea36243d

Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec
 2016-12-07 01:50:08 +00:00
Mark Renouf
cc3fad3097 Workaround for javac compilation issue of lambda code 
Since ag/32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:

> ShortcutService.java:408: error: variable ri might not have been initialized

https://android-build.googleplex.com/builds/submitted/3416256/angelfish-userdebug/latest/logs

Removing the lambda expressions corrects the issue.

(cherry picked from commit e065f7c5a9)

BUG: 32554459
Test: m
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
 2016-12-06 17:45:34 -08:00
Jeremy Joslin
9347a4f38f Merge "Adding a new string array resource for network recommendations." am: 54710df28d am: ea968e411c -s ours 
am: 472d5ecb5f  -s ours

Change-Id: Ifa31e990cf70eb861588f1cf1f4539fe0cc78319
 2016-12-07 01:42:22 +00:00
Treehugger Robot
68ea36243d Merge "Fix crashing StrictJarFile due to doubled closing." 2016-12-07 01:40:48 +00:00
Jeremy Joslin
472d5ecb5f Merge "Adding a new string array resource for network recommendations." am: 54710df28d 
am: ea968e411c  -s ours

Change-Id: I32b30b622e71c782deb21c627b33f23422c3d3ad
 2016-12-07 01:34:46 +00:00
Jeremy Joslin
ea968e411c Merge "Adding a new string array resource for network recommendations." 
am: 54710df28d

Change-Id: I7d86f734b88ff4f008e5b2e250f97f8836780ab1
 2016-12-07 01:27:10 +00:00
Treehugger Robot
54710df28d Merge "Adding a new string array resource for network recommendations." 2016-12-07 01:17:16 +00:00
Winson Chung
54f0c655b2 Fixing NPE when updating controller state. 
- Since registering the pinned stack listener is not synchronous,
  defer updating the controller state until the the listener is
  registered and we have the controller set.

Bug: 33271221
Test: Run on car_emulator_x86_64-userdebug

Change-Id: Ie122b475122bfd2c4ca6f8e439fefc2443a18a37
 2016-12-06 17:11:59 -08:00
Sudheer Shanka
78b1ea884e Update IActivityManager, ContentProviderHolder in preloaded-classes. 
Bug: 30977067
Test: N/A
Change-Id: I42eb1f014a6784eeea71da6646fa958e39c129ea
 2016-12-06 16:36:58 -08:00
Bill Yi
69b5790ee2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 82834baa35 am: eaa66c3082 -s ours am: f5795bcf54 -s ours 
am: 281451edc5  -s ours

Change-Id: Ide00ab2b5f0d54bea5edfc5baa7c573af01327ff
 2016-12-07 00:22:07 +00:00
Stephen Chen
f1b75647a3 Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED. 
Bug: 32913919
Test: n/a
Change-Id: Ied075bdcc1ebb8f0a4bc0d3bf9758fa6719ce0b9
 2016-12-06 16:21:14 -08:00
Jeremy Joslin
5ddedaad7f Merge "API for requesting network recommendations." am: 800a4e753e am: 2b57c69e25 am: 33e8de479a 
am: 2724906a6c  -s ours

Change-Id: Iaeffc3d599f1f156f70dadcf926d4d3a2e4a41d1
 2016-12-07 00:21:11 +00:00
Jeff Sharkey
f4da4f8320 Merge "Move moveCompleteApp() to Binder." am: 019867cb52 am: 19426fef23 am: d917e23bbb 
am: b7abefa16a

Change-Id: I4779344082c51ecd301be2b2df0947790403273d
 2016-12-07 00:20:09 +00:00
Jeremy Joslin
ba825554bc Adding a new string array resource for network recommendations. 
The new resource allows for multiple package names to be specified
in priority order.

Test: Nothing to test.
BUG: 33158362
Merged-In: I4a066d9220c723a17dd11e2566161fade6bb471b
Merged-In: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
Change-Id: I26ac87a49ae94dd0763173af5c8a2c6abe7cb5f8
 2016-12-06 16:19:12 -08:00
Bill Yi
281451edc5 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 82834baa35 am: eaa66c3082 -s ours 
am: f5795bcf54  -s ours

Change-Id: I1e0e1fc911d6afa7dbca3ec89a024944790194d8
 2016-12-07 00:13:21 +00:00
Jeremy Joslin
2724906a6c Merge "API for requesting network recommendations." am: 800a4e753e am: 2b57c69e25 
am: 33e8de479a

Change-Id: Ibf7f6a12eeb92f56c5873c3f7e3e10ff4adbd8fd
 2016-12-07 00:12:27 +00:00
Jeff Sharkey
b7abefa16a Merge "Move moveCompleteApp() to Binder." am: 019867cb52 am: 19426fef23 
am: d917e23bbb

Change-Id: I56d8e35174cce6a892f73f32b8246a377ba645ab
 2016-12-07 00:11:40 +00:00
Felipe Leme
965f4265c5 Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission. 
Change-Id: I84dc652f7297c2b8c9351e737074ddf43754718d
Fixes: 32950329
Test: manually verified it
 2016-12-07 00:08:40 +00:00
Bill Yi
f5795bcf54 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 82834baa35 
am: eaa66c3082  -s ours

Change-Id: I009f3327782fdb3506d30cbf75f59bbed31ed2e1
 2016-12-07 00:06:43 +00:00
Jeremy Joslin
33e8de479a Merge "API for requesting network recommendations." am: 800a4e753e 
am: 2b57c69e25

Change-Id: I8f2357942919193a22e97e4f1d9ec415b736565c
 2016-12-07 00:05:29 +00:00
Jeff Sharkey
d917e23bbb Merge "Move moveCompleteApp() to Binder." am: 019867cb52 
am: 19426fef23

Change-Id: I15640b868729b0f8e418c7b9f8d5366deb054abc
 2016-12-07 00:04:35 +00:00
Bill Yi
eaa66c3082 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 
am: 82834baa35

Change-Id: I888a0d89112441f4b7bbd7fed582646dc053bccd
 2016-12-06 23:59:13 +00:00
Jeremy Joslin
2b57c69e25 Merge "API for requesting network recommendations." 
am: 800a4e753e

Change-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9
 2016-12-06 23:58:13 +00:00
Jeff Sharkey
19426fef23 Merge "Move moveCompleteApp() to Binder." 
am: 019867cb52

Change-Id: I93e3d468b2a49f735c88e7a5146f0b013c6d49eb
 2016-12-06 23:57:05 +00:00
Bill Yi
82834baa35 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2016-12-06 15:17:16 -08:00
Treehugger Robot
800a4e753e Merge "API for requesting network recommendations." 2016-12-06 23:08:03 +00:00
Android Build Merger (Role)
7839d7601d Merge changes from topic 'am-84dbedfbf5254f90a248a387d372458c' 
* changes:
  Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev am: 7ba6d21aac am: 927c84cdde  -s ours
  Treat the mdn as an additional voicemail number am: 360d5674bd am: 88c68423af  -s ours
 2016-12-06 22:39:23 +00:00
TreeHugger Robot
892c750f17 Merge "Correct error in Configuration.updateFrom" 2016-12-06 22:38:20 +00:00
Jordan Liu
a8d003bbfd Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev am: 7ba6d21aac 
am: 927c84cdde  -s ours

Change-Id: I0475b18e270d9bf0f08f54aaee1930f14d98384a
 2016-12-06 22:38:15 +00:00
Jordan Liu
b681d096c5 Treat the mdn as an additional voicemail number am: 360d5674bd 
am: 88c68423af  -s ours

Change-Id: If22264db3c9a841b3aba90ae64b3760338bff7ae
 2016-12-06 22:37:03 +00:00
Jordan Liu
927c84cdde Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev 
am: 7ba6d21aac

Change-Id: I8db690ca67ce95fe63afaf160a834885ba3d55ff
 2016-12-06 22:28:39 +00:00
Jordan Liu
88c68423af Treat the mdn as an additional voicemail number 
am: 360d5674bd

Change-Id: Idbfdf0086d101e6c246ecee7572c6dbf2702574e
 2016-12-06 22:28:30 +00:00
Jeff Sharkey
019867cb52 Merge "Move moveCompleteApp() to Binder." 2016-12-06 22:24:26 +00:00
Jordan Liu
7ba6d21aac Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev 2016-12-06 22:23:26 +00:00