Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
9fa8b54589 Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev 2016-04-27 12:59:05 +00:00
Bill Yi
4156eaa411 Import translations. DO NOT MERGE 
Change-Id: I785aa5de30a7ddb63d7486dfcda2ac0e94528180
Auto-generated-cl: translation import
 2016-04-27 05:52:55 -07:00
Bill Yi
6c82c5ab41 Import translations. DO NOT MERGE 
Change-Id: Ice98eb3ed66513d4e324e5f1939006048caec376
Auto-generated-cl: translation import
 2016-04-27 05:43:40 -07:00
Bill Yi
ea537ea792 Import translations. DO NOT MERGE 
Change-Id: Id0714f3fe7f22917b3fe5fc8fae7c16d4e613544
Auto-generated-cl: translation import
 2016-04-27 05:38:51 -07:00
Martijn Coenen
6b8a522f16 Don't count vm_map_ram as used memory in vmallocinfo. 
Bug: 28378463
Change-Id: I1f22464dbd31bc9ee7f2307ce7eec4a0e2bbad06
 2016-04-27 14:32:30 +02:00
Bill Yi
c853d960aa Import translations. DO NOT MERGE 
Change-Id: I8193ab50ed5c7603bceda66cbb10c4aa7f93240f
Auto-generated-cl: translation import
 2016-04-27 05:23:30 -07:00
David Brazdil
72b7bed0dd Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev 
am: 074e23c

* commit '074e23c37b841065eefc26a79175fb3140bdc998':
  Fix infinite loop during package-usage.list file upgrade

Change-Id: I4b3a67885fd22282cc0b987d69265da04ead7de1
 2016-04-27 11:11:11 +00:00
TreeHugger Robot
074e23c37b Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev 2016-04-27 11:02:51 +00:00
Andrei Stingaceanu
cf38110526 Fix ListView losing scroll position 
Restrict restoring the selected position when AdapterView
gets restored for Spinner instances only.

Bug: 26991402
Bug: 23619366
Change-Id: Ib002eac5ed0b8810a3e9988ad36f03450cb03b9b
 2016-04-27 11:29:26 +01:00
Erik Kline
01fc1eb753 Merge "IpManager: add a provisioning timeout option" into nyc-dev 
am: 9c51583

* commit '9c51583dafdbfeb7e005e12dd646e4395cf7a537':
  IpManager: add a provisioning timeout option

Change-Id: I71f026d1239a4285657baac80d66da8c861e3354
 2016-04-27 09:49:56 +00:00
Erik Kline
9c51583daf Merge "IpManager: add a provisioning timeout option" into nyc-dev 2016-04-27 09:40:08 +00:00
David Brazdil
14e7acd58c Fix infinite loop during package-usage.list file upgrade 
When upgrading from version 0 to version 1 of the file
'/data/system/package-usage.list', the PackageManagerService can get
stuck in an infinite loop if one of the listed packages does not
exist, e.g. because it had been uninstalled. Fix the issue by
refactoring the loop.

Bug: 28409278
Change-Id: Ia312bd0d04f696240445b710dd6a68b93c5d5946
 2016-04-27 10:35:56 +01:00
Seigo Nonaka
c137b29fc3 Fix unexpected null check condition flipping. 
am: 6e5b602

* commit '6e5b602552b15ab95dc7b1e4e824f8da6a951fcf':
  Fix unexpected null check condition flipping.

Change-Id: Ic0cf0cf5074acd2d02a07a8b47e769869a29f88e
 2016-04-27 07:54:55 +00:00
Hugo Benichi
9b907e440c Fixes 2 race conditions in MetricsLoggerService 
- in dump, the array of pending intent was iterated without locking
  against logEvent. This can throw a ConcurrentModificationException
  if at the same time logEvent sends intents and remove them from the
  array.
- in getEvents, the returned reference was reading the reference of the
  last event after releasing the lock on mEvents, which can cause
  callers to miss events if at the same time logEvent is called and
  mLastEventReference is incremented.

Bug: 28204408
Change-Id: I7ff21d4d2c0b02d8e0b47310430dff7d8a87f0bf
 2016-04-27 16:47:55 +09:00
Seigo Nonaka
6e5b602552 Fix unexpected null check condition flipping. 
With I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0, isNull() is used for
null check but accidentally the condition is flipped.

Bug:28406262
Change-Id: I776a6c259765210a7b334a81876233b594fd25ed
 2016-04-27 16:32:44 +09:00
Erik Kline
741b15dc75 IpManager: add a provisioning timeout option 
Relatedly: remove the provisioning timeout from DhcpClient.

Bug: 17733693
Bug: 24837343
Change-Id: I6d5b835b4ca70ba6fd06df359fc2128a0df46252
 2016-04-27 16:27:44 +09:00
Svet Ganov
9931dc6c88 Add a missing null check 
am: 6f8a10b

* commit '6f8a10bd14d927f9603823c06a3e53f56392ba95':
  Add a missing null check

Change-Id: Ib40480e3dcc7cb752c2d114035ebd64f15ea28d5
 2016-04-27 06:20:06 +00:00
Svet Ganov
6f8a10bd14 Add a missing null check 
We no longer have a null settings value - instead it is a
null object. This change adds a missing null check that is
not changed to check against the null object.

bug:28406262

Change-Id: I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0
 2016-04-26 23:14:06 -07:00
Andrew Solovay
09ab9a0ca1 doc: Removed duplicate card from distribute/users page am: 5ecc2aaee8 am: 2a7de38 am: 80b5d84 
am: fc1a21d

* commit 'fc1a21d9185677a13cd2e942855a156535750326':
  doc: Removed duplicate card from distribute/users page

Change-Id: I0a0583783619c51e2d80d11b91ae06ee5aff9245
 2016-04-27 05:55:20 +00:00
Dan Yu
f33d76acb6 Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs am: 88e0bbce56 am: 1eb657a am: 9e1a923 
am: 1497af4

* commit '1497af4f25736f120d8cf0c117dd23f53cbec0a6':
  docs: 3 additional review criteria for Android TV

Change-Id: I9edf9e626fea83f9d31fb54825376e03dea44c21
 2016-04-27 05:55:13 +00:00
David Friedman
343ac7d41f Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs. am: 0e7bc1b215 am: f829492 am: 0811472 
am: e4ed9c7

* commit 'e4ed9c787458347661bd3df2ce5541d2a25354c6':
  Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.

Change-Id: I9838d1046ba22295dbd08382e635bd4b718b6d28
 2016-04-27 05:55:03 +00:00
David Friedman
f852cf54c4 Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: e20502c240 am: 1c2ce95 am: 25a92f0 
am: 5256b6c

* commit '5256b6ce155301e13562e5414366469b87126c5e':
  Docs: Localized DAC pages for N Preview.

Change-Id: If92ff1e444c8450ef1b2ee0929e5be428737e8d4
 2016-04-27 05:54:48 +00:00
Cheryl Potter
1bb4d33a91 Merge "docs: Small edits to Vector Asset Studio Support Library support b/28199128" into mnc-mr-docs am: 0a67c6a am: b8f834d am: 1f48ddb 
am: a179e18

* commit 'a179e1845d8b1a38c9480390bd5b5fba64a5fed4':
  docs: Small edits to Vector Asset Studio Support Library support b/28199128

Change-Id: I90e99352622353e38c6e803cf3f623fc3018cf20
 2016-04-27 05:54:24 +00:00
Dan Yu
cb1184e548 Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94 am: cf35d40 am: d563c25 
am: f09e309

* commit 'f09e309f7fa6f6f6882a2fb155ca08feae2acbda':
  docs: Fixing various minor issues

Change-Id: I4b51253135538789dd9731553137971091c4043f
 2016-04-27 05:54:00 +00:00
Kevin Hufnagle
cd01272740 Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am: fa8847d am: ee3411d am: 0e5d260 
am: 27076c7

* commit '27076c7bfcbe8623e608d31f8697241ee6855508':
  docs: [Revert] Improved description of "package" attribute (manifest).

Change-Id: I3780c44c982b4cb25562c446962bdef4514f1696
 2016-04-27 05:53:47 +00:00
Cheryl Potter
a48e889b10 docs: Remove banned deep link term from release notes b/28153615 am: 0489fe9 am: 6e09530 am: d88a3ca 
am: 526c6dd

* commit '526c6dd8c3b84ed1905d4d03aef1daad910d6305':
  docs: Remove banned deep link term from release notes b/28153615

Change-Id: Ibc971dc7b6ac5fb15f1652dec1a98e33398a043b
 2016-04-27 05:53:37 +00:00
Kevin Hufnagle
ded3f56b31 Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am: 190bf3b943 am: 19db30b am: 7e8840d 
am: 096e5a8

* commit '096e5a807ffaf50eb3413b72c8ca5174dd0ea139':
  docs: Improved description of "package" attribute (manifest).

Change-Id: I7dd57da08fee9e17a390509c3a620f037faf5442
 2016-04-27 05:53:24 +00:00
Kevin Hufnagle
aa8a0404ac Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8 am: 3c8a59f 
am: 48a4930

* commit '48a4930ef6d19191b379170b21fe5dce52c91c32':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: Iac5054e4365091e2ec14fe7bdf7449c4c8da542b
 2016-04-27 05:53:11 +00:00
Adarsh Fernando
10c42541c6 Merge "Docs: Background optimizations \'foreground\' -> \'running app\' fix." into mnc-mr-docs am: df0509bce1 am: 86efe43 am: 016500b 
am: b26ec02b

* commit 'b26ec02bf91c178213163c4ee794031fe2faf8db':
  Docs: Background optimizations 'foreground' -> 'running app' fix.

Change-Id: Ifa3657eba9359ee67caa1e900903fc5ee9a2af3f
 2016-04-27 05:52:56 +00:00
Daichi Hirono
59688a5883 Remove "don't disconnect the device" description. 
Previously MTP notification shows a message "don't disconnect the
device". But there is no unmount button for MTP. Because it's safe to
disconnect MTP device after completing file operations, we remove the
message from MTP notification.

Change-Id: I78b7649e3a9982c02b0312d221d395e9ac799318
Fixes: 28194216
 2016-04-27 14:49:06 +09:00
Andrew Solovay
fc1a21d918 doc: Removed duplicate card from distribute/users page am: 5ecc2aaee8 am: 2a7de38 
am: 80b5d84

* commit '80b5d84dcd816d7a132ee20dbc98677ff818c35f':
  doc: Removed duplicate card from distribute/users page

Change-Id: I1800f2b42f5af02006d07b7b64fa1197a289da96
 2016-04-27 05:44:24 +00:00
Scott Rowe
1497af4f25 Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs am: 88e0bbce56 am: 1eb657a 
am: 9e1a923

* commit '9e1a9233215b21785b07a753c13ec8eed851d0e8':
  docs: 3 additional review criteria for Android TV

Change-Id: I8d17d44886ea71fc11d6f8c3c03c3dc938c50b92
 2016-04-27 05:44:02 +00:00
David Friedman
e4ed9c7874 Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs. am: 0e7bc1b215 am: f829492 
am: 0811472

* commit '0811472a36c7b18635654e97866c406aab587e89':
  Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.

Change-Id: I50f0e413de828bd4aa61dadd462e525e00dcf659
 2016-04-27 05:43:19 +00:00
David Friedman
5256b6ce15 Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: e20502c240 am: 1c2ce95 
am: 25a92f0

* commit '25a92f0762ea5fc1e60f00b6f7634ffccc8265cd':
  Docs: Localized DAC pages for N Preview.

Change-Id: I6bc25875398fbad13821095a5e0115969620fcdb
 2016-04-27 05:42:07 +00:00
Cheryl Potter
a179e1845d Merge "docs: Small edits to Vector Asset Studio Support Library support b/28199128" into mnc-mr-docs am: 0a67c6a am: b8f834d 
am: 1f48ddb

* commit '1f48ddb1902764bdcbd4eb885a25a1c8c5897a34':
  docs: Small edits to Vector Asset Studio Support Library support b/28199128

Change-Id: I4fdd22938e8e4443b3d69fc4173aac3824d83ce4
 2016-04-27 05:41:44 +00:00
Daniel Yu
f09e309f7f Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94 am: cf35d40 
am: d563c25

* commit 'd563c253911b5ad86804b474acbc931d27572d2a':
  docs: Fixing various minor issues

Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
 2016-04-27 05:41:21 +00:00
Kevin Hufnagle
27076c7bfc Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am: fa8847d am: ee3411d 
am: 0e5d260

* commit '0e5d260ae793a42efc974c0674a530f808d7f05a':
  docs: [Revert] Improved description of "package" attribute (manifest).

Change-Id: I336b8fa0787934813004b8c3b322a408635c6c87
 2016-04-27 05:40:59 +00:00
Cheryl Potter
526c6dd8c3 docs: Remove banned deep link term from release notes b/28153615 am: 0489fe9 am: 6e09530 
am: d88a3ca

* commit 'd88a3caddb34aed7bef5a7d01f62164eacbcbbb0':
  docs: Remove banned deep link term from release notes b/28153615

Change-Id: Ibdf8a433c31d8487d1319ff61912baacc0500e3e
 2016-04-27 05:40:37 +00:00
Kevin Hufnagle
096e5a807f Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am: 190bf3b943 am: 19db30b 
am: 7e8840d

* commit '7e8840dec7879e2973ebf1e09c74a482c1ee8651':
  docs: Improved description of "package" attribute (manifest).

Change-Id: I8ea2623afea04cc3f5c5b9550fc66cb42d79a5d2
 2016-04-27 05:40:13 +00:00
Kevin Hufnagle
48a4930ef6 Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am: c3500321cd am: c9c3ad8 
am: 3c8a59f

* commit '3c8a59fc25e7d1bd777f15ef9712696b341e2a49':
  docs: Clarified purpose of application "name" attr within manifest.

Change-Id: Ic8bb4cc1edbbef00d06d030e1cdae215ceb9d2e5
 2016-04-27 05:39:08 +00:00
Adarsh Fernando
b26ec02bf9 Merge "Docs: Background optimizations \'foreground\' -> \'running app\' fix." into mnc-mr-docs am: df0509bce1 am: 86efe43 
am: 016500b

* commit '016500bd5850869db649abe616ab327118b843d9':
  Docs: Background optimizations 'foreground' -> 'running app' fix.

Change-Id: I90a096de57b9591304623a9713d2ef103c814290
 2016-04-27 05:38:04 +00:00
Kevin Hufnagle
c0ecde484d Merge "resolve merge conflicts of 70adfe3 to nyc-dev" into nyc-dev 
am: 5dcd5e5

* commit '5dcd5e5ba573a83c779725d1fe8592f26a2ca1d0':
  docs: Fixed whitespace in documents referencing "Application" element.

Change-Id: I2b31bd3a9829fec2d60e9c742832dbf7a256b16f
 2016-04-27 05:36:50 +00:00
Bill Yi
68823d1c3c Import translations. DO NOT MERGE 
Change-Id: I5f8e0d3df0dfeb05c8315d0b17a861bee8096aaf
Auto-generated-cl: translation import
 2016-04-26 22:29:39 -07:00
Jeff Tinker
3c9c53352f Merge "Remove MediaDrm stack from mediaserver" into nyc-dev 
am: 892a6a3

* commit '892a6a343d3c53caef3388f83861af814c8ba20a':
  Remove MediaDrm stack from mediaserver

Change-Id: I4f7b959212afe7811d54370ad4cdfeda632aab78
 2016-04-27 05:26:54 +00:00
Jaewan Kim
c6c5d8dc5b Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true 
Bug: 28410270
Change-Id: I547556bec20a756735edad1692c64d6bd5a13773
 2016-04-27 14:25:37 +09:00
Kevin Hufnagle
5dcd5e5ba5 Merge "resolve merge conflicts of 70adfe3 to nyc-dev" into nyc-dev 2016-04-27 05:24:44 +00:00
Bill Yi
119fe56bc7 Import translations. DO NOT MERGE 
Change-Id: I462f55a9c48e4154ce97bbe76b2b8ef6add73086
Auto-generated-cl: translation import
 2016-04-26 22:23:19 -07:00
Jeff Tinker
892a6a343d Merge "Remove MediaDrm stack from mediaserver" into nyc-dev 2016-04-27 05:21:49 +00:00
Kevin Hufnagle
8ce7d79c64 resolve merge conflicts of 70adfe3 to nyc-dev 
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
 2016-04-26 22:14:38 -07:00
Baligh Uddin
15c972e137 Import translations. DO NOT MERGE 
Change-Id: Ieeed8b27ac11d25abab727f3228dd4177a12a606
Auto-generated-cl: translation import
 2016-04-26 21:55:28 -07:00