Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
6639e2fc3a Merge "Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c" into nyc-mr1-dev-plus-aosp 2016-05-19 07:18:35 +00:00
Andrii Kulian
c6e533e90d Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 475ab2be5c

* commit '475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a':
  Fix build breakage caused by redefining attrs

Change-Id: I9c6ef99d1bd7b4affeee500dc6a1b0eca1b84b5b
 2016-05-19 07:18:02 +00:00
Andrii Kulian
38e3b3ba91 Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 1b9a930ba4

* commit '1b9a930ba4a5884b01b9ebf6b92065a55c689dec':
  Fix build breakage caused by redefining attrs

Change-Id: Iae28ff991e2dc154db009f75da45f7aa25ada5d2
 2016-05-19 07:17:57 +00:00
Andrii Kulian
1b9a930ba4 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6
 2016-05-19 07:15:03 +00:00
Andrii Kulian
475ab2be5c Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: I0663ec408eec497c64c35a9c7d6f43e223c3cc22
 2016-05-19 07:15:01 +00:00
TreeHugger Robot
fa020a8094 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 2016-05-19 07:06:50 +00:00
Andrii Kulian
bd17d8c63b Fix build breakage caused by redefining attrs 
minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
 2016-05-18 22:35:19 -07:00
Seigo Nonaka
ea906b37df Fix system locale propagation during user creation. 
Since Android N, the system locale is stored in Settings.System. Because
of this change, we need to propagate the previous user's system locale
to the newly created user.

When the user switch happens, updateUserConfigurationLocked is called
for the next user. Usually, some configuration values (font scale and
system locale) are overwritten by the next user's settings. However,
the first time the next user logs in (and only the first time), the
settings value is empty. So, we need to decide between keeping the
passed configuration's value or resetting to the default. For the
fontScale, it is reset to the default (issue 27187556). For the system
locale, the previous user's locale should be used. This CL addresses
this.

At the same time, the inherited configuration should be stored to the
settings, otherwise the inherited configuration is lost the next time
the second user logs in.

Bug: 27803966
Change-Id: I4632671316d26e00ab6fe80ff3433f097f0e0954
 2016-05-19 13:28:05 +09:00
Erik Kline
03307df369 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: ae53fb4a43

* commit 'ae53fb4a436bcbb7deea668a26d2ba66bb4c5af3':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
 2016-05-19 04:27:24 +00:00
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
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
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
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
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
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
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
Selim Cinek
665f53fd13 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 
am: 942bcffe7b

* commit '942bcffe7b9139a486a03cb0359c39d66d8bb5cc':
  Fixed a bug where autobundling could lead to bugs

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

* commit '8b624e59787c85a5a54bd80718447e273b58abc0':
  Fixed a bug where autobundling could lead to bugs

Change-Id: I08b67312746ff5a5d359342615143597307069c7
 2016-05-19 01:12:22 +00:00
Andrew Solovay
2c5ed120c4 doc: Updates to release notes post-DP3 am: fd30a43337 
am: 788edcb7ec

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

Change-Id: I656981ca1a6b16e4a429b84abfdc6efad20216cf
 2016-05-19 01:09:38 +00:00
Joe Fernandez
ef0f1fd4d5 docs: Add video to Instant Apps landing page 
b/28842359

Change-Id: Idb097501425ca0a50f547a22f54217878075376a
 2016-05-18 18:07:17 -07:00
Selim Cinek
942bcffe7b Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 
am: a75bd7d4e0

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

Change-Id: Ice2ec07392808c127cac7424f2e193789d712ece
 2016-05-19 01:06:36 +00:00