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

256724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
497956cf15 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: aa13d0f09d  -s ours

Change-Id: I8580ef0aca3b98579053a3eae475167b2037c3ed
 2016-11-09 02:32:19 +00:00
Bill Yi
f432618582 Import translations. DO NOT MERGE 
am: 95cd3f1976  -s ours

Change-Id: I1e881c254423133430aae108a87d349d49ba07d6
 2016-11-09 02:32:18 +00:00
TreeHugger Robot
aa13d0f09d Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-11-09 02:26:16 +00:00
Bill Yi
95cd3f1976 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32363164
Change-Id: I8b2e02fa6ddcf65e7bd9f413e9d31022b60b57a5
 2016-11-08 17:24:36 -08:00
Erik Kline
88424ed1b2 Merge "Handle IpReachabilityMonitor errors better." into nyc-mr2-dev 2016-11-09 01:21:26 +00:00
TreeHugger Robot
c2cbd3380b Merge "Pinner Service - update Camera app max size to 80MB" into nyc-mr2-dev 2016-11-08 22:05:21 +00:00
Philip Cuadra
ac39b9626d Pinner Service - update Camera app max size to 80MB 
The prebuilt camera app in /system/app uses uncompressed libs to save
memory.  A recent update pushed it over the arbitrary 50MB limit.  This
change moves that arbitrary limit to 80MB.

Bug 32289474
Tested manually

Change-Id: Icf4e4476447fd363f2ab311b237f17a0e9d43053
 2016-11-08 11:23:23 -08:00
Manu Cornet
c7f90bfb4f Merge "DO NOT MERGE - Slightly better encapsulation for the set of recent activities" into nyc-mr2-dev 2016-11-08 19:13:07 +00:00
Manu Cornet
6abecd2c2a DO NOT MERGE - Slightly better encapsulation for the set of recent activities 
Manual cherrypick from master since automated cherrypick had merge
conflicts.

Bug: 32101881
Test: Behavior is 100% covered by existing automated tests
Merged-In: Ibf2f5af268ec00abc8caa6232fb517b60545ad46
Change-Id: I04516c299ca00b2bfea731979af4aa918a056041
 2016-11-08 11:11:04 -08:00
Bill Yi
01c4a57a8d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978 -s ours 
am: 5501036062  -s ours

Change-Id: Idd14727a629fbd7eca5a1d81e7c56ad52053b2fb
 2016-11-08 12:08:40 +00:00
Bill Yi
ffc2bf7f28 Import translations. DO NOT MERGE am: 7821bbd9a5 -s ours 
am: 82b5fa3fea  -s ours

Change-Id: I8468dac311585e0b187bc15f782d23aa89e7c7b9
 2016-11-08 12:07:49 +00:00
Bill Yi
5501036062 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 197da1f978  -s ours

Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae
 2016-11-08 12:02:48 +00:00
Bill Yi
8c539aa606 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 0a2dbc7a8f  -s ours

Change-Id: I98c68abf6c4b81af8dc1a2bb31a7ba5c586673fb
 2016-11-08 12:02:48 +00:00
Bill Yi
82b5fa3fea Import translations. DO NOT MERGE 
am: 7821bbd9a5  -s ours

Change-Id: I026f6272bc57f0a16d87cb578668aeecea44c772
 2016-11-08 12:02:47 +00:00
Bill Yi
488ea0b715 Import translations. DO NOT MERGE 
am: aa451616c8  -s ours

Change-Id: Ife9391d34b07231b0e61435fb76050ee42afdad0
 2016-11-08 12:02:47 +00:00
TreeHugger Robot
0a2dbc7a8f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-11-08 11:57:02 +00:00
TreeHugger Robot
197da1f978 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-11-08 11:53:19 +00:00
Bill Yi
7821bbd9a5 Import translations. DO NOT MERGE 
Change-Id: I1caa69921dbde7442c433f3373f17a442d1b48b3
Auto-generated-cl: translation import
 2016-11-08 02:03:00 -08:00
Erik Kline
e452660466 Handle IpReachabilityMonitor errors better. 
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().

Test: runtest frameworks-wifi
      passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
      which fails with an NPE for unrelated reasons.

Bug: 31038971
Bug: 31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
 2016-11-08 16:02:24 +09:00
Bill Yi
aa451616c8 Import translations. DO NOT MERGE 
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
 2016-11-07 20:59:23 -08:00
Michael Kwan
bbc8d1d6ec Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev 
am: 4ad89bf51f

Change-Id: I3024ca375ebf077cba52696da7ac549bf0eff781
 2016-11-08 03:31:58 +00:00
Michael Kwan
177fe7ec1d Tweak AlertDialog and Preference layout for nonround watches. 
am: 6c8e3bb43d

Change-Id: I8403f321396198d1c8b481c920c52448f2c024d0
 2016-11-08 03:31:55 +00:00
TreeHugger Robot
4ad89bf51f Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev 2016-11-08 03:21:14 +00:00
Jeff Sharkey
1563f499a1 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19 am: 557389d96b 
am: bd314fa444

Change-Id: Ib0f38618b7fa29de5279fc142ee616c96f2b1956
 2016-11-08 01:12:13 +00:00
Jeff Sharkey
57d21ef02a Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361 am: 4ef12b0404 
am: a8f9a6201b

Change-Id: I5df11dfb82a5b10dd1a6154568d85c0d561f110f
 2016-11-08 01:04:36 +00:00
Jeff Sharkey
bd314fa444 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19 
am: 557389d96b

Change-Id: I587ecb5f31246677c6e57814cb744ef2bb38572b
 2016-11-08 01:02:12 +00:00
Jeff Sharkey
6a75cea1c6 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe am: 4448f11e8a 
am: dd01f35677

Change-Id: Ie94abefc86a3f218c2aa1740f6ba2036a6a7e55e
 2016-11-08 01:02:12 +00:00
Jeff Sharkey
a8f9a6201b Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361 
am: 4ef12b0404

Change-Id: Ie986c43f72b3bc9140f23df71845fb2c0978c29e
 2016-11-08 00:55:36 +00:00
Jeff Sharkey
dd01f35677 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe 
am: 4448f11e8a

Change-Id: Ic5676d9bed87fa5777eee1ce578b6402d4274645
 2016-11-08 00:53:15 +00:00
Jeff Sharkey
a5cdb7a19a Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa am: a27ca045e5 
am: a3d8d2e73e

Change-Id: I14455f72164933ce9cc2061fc3716a59566dae90
 2016-11-08 00:52:41 +00:00
Jeff Sharkey
557389d96b Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 
am: e9cd3aea19

Change-Id: I3b61d8fa4e3ad2ba0ba99e6918ace3a5871e128e
 2016-11-08 00:49:41 +00:00
Jeff Sharkey
4ef12b0404 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 
am: acdcb74361

Change-Id: I78abfa2adb14c2065117be41568d0fba90a277f7
 2016-11-08 00:47:56 +00:00
Jeff Sharkey
4448f11e8a Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 
am: aaeb6286fe

Change-Id: I33a40f027ecbd233f7e8cafd61f50479ff565dd8
 2016-11-08 00:42:43 +00:00
Jeff Sharkey
a3d8d2e73e Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa 
am: a27ca045e5

Change-Id: Ie91c35c5b148e8d51dc54c398ce019e4f2046a31
 2016-11-08 00:42:42 +00:00
Jeff Sharkey
ae7ff86216 Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c am: 5cae493d1b 
am: cf2d99289c

Change-Id: I2d0450c4d3aeb1250d0411fbe2083ed548cb4e35
 2016-11-08 00:38:46 +00:00
Jeff Sharkey
a27ca045e5 Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e 
am: d93ed63baa

Change-Id: I1d2a9bd0af847b8316720651bc2192151f999bcd
 2016-11-08 00:35:26 +00:00
Jeff Sharkey
e9cd3aea19 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 
am: a61e5fb9f6

Change-Id: I3716aa9bfc3816e9a0159560daf755fcf89904f1
 2016-11-08 00:33:50 +00:00
Jeff Sharkey
acdcb74361 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 
am: 8554f2d934

Change-Id: I81c9598e3434fe44f1324a4115a9eda39047070d
 2016-11-08 00:32:05 +00:00
Jeff Sharkey
cf2d99289c Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c 
am: 5cae493d1b

Change-Id: I1a16cfda1a9513824f98def5a257da4abe2dc758
 2016-11-08 00:31:42 +00:00
Jeff Sharkey
aaeb6286fe Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a 
am: 874a7af9f7

Change-Id: Ia13bf45bfb0ac5057a2a8899b0bd543c238d7d3e
 2016-11-08 00:29:22 +00:00
Jeff Sharkey
d93ed63baa Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc 
am: e4419f474e

Change-Id: Ic7ac4b928536fb5d7b18957d35e2ca1aea832fed
 2016-11-08 00:25:31 +00:00
Jeff Sharkey
5cae493d1b Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 
am: 9854b1707c

Change-Id: I35e050710d0af31631ac2b0f823ed2fcabf174e2
 2016-11-08 00:19:39 +00:00
Jeff Sharkey
a61e5fb9f6 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 
am: 09e10e54f8

Change-Id: I1bb3bc5f0db563797262a8e4485f4ede25db4c99
 2016-11-08 00:17:51 +00:00
Jeff Sharkey
8554f2d934 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 
am: babd7e06d3

Change-Id: Ib810882924443e195b31d505f8d1657914c6edfe
 2016-11-08 00:16:13 +00:00
Jeff Sharkey
874a7af9f7 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c 
am: 8e803f734a

Change-Id: I80f21d5df3b37c27a9c56c1412ae942b88264349
 2016-11-08 00:13:51 +00:00
Jeff Sharkey
e4419f474e Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 
am: 84ef9e69fc

Change-Id: Icf8d31fa28b1223d3f789ff653bbecfbcf87bcfb
 2016-11-08 00:10:32 +00:00
Jeff Sharkey
9854b1707c Public volumes belong to a single user. am: def2123f56 -s ours 
am: de221f06a3

Change-Id: I73f0c785931688020dcdc5bd16f54449f0bf6f51
 2016-11-08 00:09:41 +00:00
Jeff Sharkey
568e46ebe1 Merge "Public volumes belong to a single user." into nyc-dev am: d537f76b88 am: 930e77314b am: 8c73d7989f 
am: 299aa88e26

Change-Id: I133cdcd293ca15a2b9e5ee1e3d36f881e710c3ed
 2016-11-08 00:08:33 +00:00
Jeff Sharkey
ce90c7aa30 Public volumes belong to a single user. am: 6566fbe99b am: 50cc6c111c am: 0b28736f03 
am: 8b2091ea94

Change-Id: Ife8911bb4e970654a3759448bd9a58d158012750
 2016-11-08 00:06:59 +00:00
Jeff Sharkey
0d206a20f7 Merge "Public volumes belong to a single user." into nyc-mr1-dev am: 0f35d29a7e 
am: 83287ac02c

Change-Id: If37daa325d71d86a231afb617c4b780e74a9de16
 2016-11-08 00:06:08 +00:00