Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
f99efa7e75 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
 2016-05-19 04:24:16 +00:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
 2016-05-19 04:21:17 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
 2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andreas Gampe
8769a8dd5f Merge "Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: fcbc43b70a" into nyc-mr1-dev-plus-aosp 
am: 8636c71df6

* commit '8636c71df636633c5d74a4ca4046d302d3167111':

Change-Id: Icb31a9fc18cf75f824bdc41ff62cf3e1686eea87
 2016-05-19 04:00:20 +00:00
Andreas Gampe
059db73b1f Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: 3fbf298984 
am: 36061b85ff

* commit '36061b85ff3776c4df57b1ea42c7059234585be7':
  Frameworks/base: Optimize LoadedApk

Change-Id: I894cf7dc97eaa6ddaec758cb7731803e173209ca
 2016-05-19 04:00:15 +00:00
Android Build Merger (Role)
8636c71df6 Merge "Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: fcbc43b70a" into nyc-mr1-dev-plus-aosp 2016-05-19 03:55:51 +00:00
Andreas Gampe
16673d6849 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: fcbc43b70a

* commit 'fcbc43b70a8c441f438020574a73550e0d1c7e6c':
  Frameworks/base: Optimize LoadedApk

Change-Id: I1fe3dd5240dbff0f73592538eb1b2af7b569eb1b
 2016-05-19 03:55:19 +00:00
Andreas Gampe
36061b85ff Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: 3fbf298984

* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
 2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
 2016-05-19 03:51:39 +00:00
Andreas Gampe
fcbc43b70a Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: I3cefc230805bc11051acbf3b92382be2aa8dd273
 2016-05-19 03:51:37 +00:00
TreeHugger Robot
8cb3b2bb5c Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 2016-05-19 03:43:08 +00:00
Ian Rogers
4509b940fb Fix 2 instances of buggy double check locking on non-volatile fields. 
Bug caught by Error Prone:
http://errorprone.info/bugpattern/DoubleCheckedLocking

Bug: 27723540
Change-Id: I0b0c06ce4ae1ffb668e8ab3a7fe07706df173f18
 2016-05-18 20:04:13 -07:00
Andrii Kulian
e4ce27a277 Merge "Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea am: ba15163b2a" into nyc-mr1-dev-plus-aosp 
am: dc88bfa430

* commit 'dc88bfa430c053766c031d431863a89abb6eab72':

Change-Id: I1f38514ed2e9f1b5a1240f0ef39cfa86200969d1
 2016-05-19 02:01:25 +00:00
Andrii Kulian
fe8863e5cc Merge "Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 1699b51cbe" into nyc-mr1-dev-plus-aosp 
am: c6e2e5fcc7

* commit 'c6e2e5fcc7cc937a4e1e0792ece74b227f194db4':

Change-Id: I03d87fdf735a8ebbe6bbb25d01b79747f84e50da
 2016-05-19 02:01:21 +00:00
Andrii Kulian
ff219d3c00 Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea am: 3a6d6d61d8 
am: ea6ff6a338

* commit 'ea6ff6a3380970c65d35bc0798a91b64b1d81ef5':
  Update docs for minWidth/minHeight attributes

Change-Id: I3a573207d04bf704dd1ede69c57acf51d14cb4b2
 2016-05-19 02:01:13 +00:00
Andrii Kulian
ebf7a56e69 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 81ce16a2e6 
am: c59e70d520

* commit 'c59e70d52015a73fb7607ae71d2a45e00776ac26':
  Rename minWidth/Height attributes

Change-Id: I3ecfd0db6eaa56f1ef3e39cb1b76f62f03074b35
 2016-05-19 02:00:50 +00:00
Android Build Merger (Role)
dc88bfa430 Merge "Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea am: ba15163b2a" into nyc-mr1-dev-plus-aosp 2016-05-19 01:54:01 +00:00
Android Build Merger (Role)
c6e2e5fcc7 Merge "Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 1699b51cbe" into nyc-mr1-dev-plus-aosp 2016-05-19 01:53:49 +00:00
Andrii Kulian
33017aca6d Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea 
am: ba15163b2a

* commit 'ba15163b2a0821f74691e1df30c56d0fef800e0e':
  Update docs for minWidth/minHeight attributes

Change-Id: I15109c215653f11a0299a94509f7ebe7daf8c946
 2016-05-19 01:53:18 +00:00
Andrii Kulian
ea6ff6a338 Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea 
am: 3a6d6d61d8

* commit '3a6d6d61d8c40125355099f0c59222b44b66ed28':
  Update docs for minWidth/minHeight attributes

Change-Id: I8388e4e2e3ff0d70f1cd15056f74a9b07746c5b9
 2016-05-19 01:53:13 +00:00
Andrii Kulian
5012c0ea4f Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 
am: 1699b51cbe

* commit '1699b51cbe80dbf9e5e496732a7c970d049613a2':
  Rename minWidth/Height attributes

Change-Id: I36bcb0a0902378b4bbd2adb8ab30be5609b7e856
 2016-05-19 01:53:12 +00:00
Andrii Kulian
c59e70d520 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 
am: 81ce16a2e6

* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
  Rename minWidth/Height attributes

Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
 2016-05-19 01:53:09 +00:00
Andrii Kulian
ba15163b2a Merge "Update docs for minWidth/minHeight attributes" into nyc-dev 
am: 13778161ea

* commit '13778161ea58c56be37aa08778551b217ad649e4':
  Update docs for minWidth/minHeight attributes

Change-Id: Ic159c2dbdb51851f87d150e7e982c8388cb62a5a
 2016-05-19 01:48:40 +00:00
Andrii Kulian
3a6d6d61d8 Merge "Update docs for minWidth/minHeight attributes" into nyc-dev 
am: 13778161ea

* commit '13778161ea58c56be37aa08778551b217ad649e4':
  Update docs for minWidth/minHeight attributes

Change-Id: I035cab93098c1281beb4a179f47070fe845a60e1
 2016-05-19 01:48:35 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
 2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
 2016-05-19 01:48:19 +00:00
Andrii Kulian
13778161ea Merge "Update docs for minWidth/minHeight attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Joe Fernandez
4083d8bfa4 Merge "Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 am: 31676c1a9b am: 4fe4d41e30" into nyc-mr1-dev-plus-aosp 
am: 138ead500e

* commit '138ead500edecf2f1e2146cec617de775f8f4438':

Change-Id: Iaf5620a0fc354ee9c35cd9373b7e9aa270e32d4d
 2016-05-19 01:40:15 +00:00
Joe Fernandez
0ed99dccce Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 am: 31676c1a9b am: 60521acf12 
am: e084633287

* commit 'e084633287116cf2ccf6c65500aebfa4f44f9034':
  docs: Add video to Instant Apps landing page

Change-Id: Ia72fe687d2e06cc0622cfd11c352d7d62b017a14
 2016-05-19 01:39:59 +00:00
TreeHugger Robot
7b81841162 Merge "Convert ItemDragListenerTest to JUnit4, and add it to APCT." 2016-05-19 01:34:53 +00:00
Android Build Merger (Role)
138ead500e Merge "Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 am: 31676c1a9b am: 4fe4d41e30" into nyc-mr1-dev-plus-aosp 2016-05-19 01:34:46 +00:00
Joe Fernandez
2040acc6d0 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 am: 31676c1a9b 
am: 4fe4d41e30

* commit '4fe4d41e30dcc7ce77f0dd29717277e0aa0d9287':
  docs: Add video to Instant Apps landing page

Change-Id: I812e0862818e4cf959c3e33e58f0a5dde050f2d7
 2016-05-19 01:34:18 +00:00
Joe Fernandez
e084633287 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 am: 31676c1a9b 
am: 60521acf12

* commit '60521acf124204c4574910b0c22f6f23f4532f48':
  docs: Add video to Instant Apps landing page

Change-Id: Ic9e5ea6beea26e357083911575c5012a6ae9c46b
 2016-05-19 01:34:12 +00:00
Joe Fernandez
60521acf12 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 
am: 31676c1a9b

* commit '31676c1a9bbdf2255ba66d2a2bf9899ccf418eb5':
  docs: Add video to Instant Apps landing page

Change-Id: Ic5e4a2735ea54403ed38ff9cec92e2e5865ee1ad
 2016-05-19 01:30:10 +00:00
Joe Fernandez
4fe4d41e30 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 am: ac9135e737 
am: 31676c1a9b

* commit '31676c1a9bbdf2255ba66d2a2bf9899ccf418eb5':
  docs: Add video to Instant Apps landing page

Change-Id: I2c92c91bea4565e0cf31171567fd6c4696abd613
 2016-05-19 01:30:09 +00:00
Andrew Solovay
8d4f90db2a Merge "doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec am: 2c5ed120c4 am: 277aa236de" into nyc-mr1-dev-plus-aosp 
am: 81569fe66e

* commit '81569fe66e6f6e535c9861c7bfe4fdf808fdfbc3':

Change-Id: I36af61e9b2bf6b9bf75c975c120404fdd3735fae
 2016-05-19 01:30:04 +00:00
Joe Fernandez
31676c1a9b Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs am: 99ffb30302 
am: ac9135e737

* commit 'ac9135e737ff53b6e680d9f81dd32012365041b4':
  docs: Add video to Instant Apps landing page

Change-Id: I3c97783703ce80079636f18d4708796b34b351e9
 2016-05-19 01:25:19 +00:00
Andrew Solovay
ef019aa5ff doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec am: 2c5ed120c4 am: e1d034346d 
am: 0455f0687b

* commit '0455f0687bc298760b9b9f783957de4a5415b540':
  doc: Updates to release notes post-DP3

Change-Id: I08e679713db6cdaa358fb92d08e67ead28cfd5f8
 2016-05-19 01:25:18 +00:00
Android Build Merger (Role)
81569fe66e Merge "doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec am: 2c5ed120c4 am: 277aa236de" into nyc-mr1-dev-plus-aosp 2016-05-19 01:21:39 +00:00
Andrew Solovay
e50492759b doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec am: 2c5ed120c4 
am: 277aa236de

* commit '277aa236deceed987fcd845f53b050cf6e019659':
  doc: Updates to release notes post-DP3

Change-Id: I0f83dc7801f9e264d816245a86777353489b6bac
 2016-05-19 01:21:10 +00:00
Andrew Solovay
0455f0687b doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec am: 2c5ed120c4 
am: e1d034346d

* commit 'e1d034346d87cabdc2df32e4690d74e692521878':
  doc: Updates to release notes post-DP3

Change-Id: I99bb45b0a2f3032363975c6d140d1cfba20e9747
 2016-05-19 01:21:06 +00:00
Joe Fernandez
ac9135e737 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs 
am: 99ffb30302

* commit '99ffb30302017f00b349369181cbda72c3276170':
  docs: Add video to Instant Apps landing page

Change-Id: Icd8bc9c7d8bbd432889e880eec512c1213baf9af
 2016-05-19 01:20:21 +00:00
Selim Cinek
eab083f621 Merge "Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 am: 942bcffe7b" into nyc-mr1-dev-plus-aosp 
am: 1c96b6177d

* commit '1c96b6177d1ad48a4522194a105aa5633b2c4d43':

Change-Id: I4dcfe8258dc0d4b2c9001a6f9bb256bd013d0109
 2016-05-19 01:16:45 +00:00
Selim Cinek
024c1ebd92 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 am: 8b624e5978 
am: 97ea6c172d

* commit '97ea6c172dcda191f0e345e4fcff73e84252088b':
  Fixed a bug where autobundling could lead to bugs

Change-Id: Ia98a345663d0838524b3521d372885f8df86af47
 2016-05-19 01:16:28 +00:00
Andrew Solovay
e1d034346d doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec 
am: 2c5ed120c4

* commit '2c5ed120c4d44c3d22544220aa950353bc9872b8':
  doc: Updates to release notes post-DP3

Change-Id: Idb6f0f64ac7073b186aa1fe7ad330f370264b70a
 2016-05-19 01:16:06 +00:00
Andrew Solovay
277aa236de doc: Updates to release notes post-DP3 am: fd30a43337 am: 788edcb7ec 
am: 2c5ed120c4

* commit '2c5ed120c4d44c3d22544220aa950353bc9872b8':
  doc: Updates to release notes post-DP3

Change-Id: I08a1327c1419f6bfe7d8c4cb58e7001204f17b37
 2016-05-19 01:16:02 +00:00
Joe Fernandez
99ffb30302 Merge "docs: Add video to Instant Apps landing page" into mnc-io-docs 2016-05-19 01:13:23 +00:00
Android Build Merger (Role)
1c96b6177d Merge "Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 am: 942bcffe7b" into nyc-mr1-dev-plus-aosp 2016-05-19 01:13:08 +00:00