Commit Graph

12928 Commits

Author SHA1 Message Date
Martijn Coenen
83f7c39757 Merge "NFC antenna location asset." into nyc-dev am: 262a8f2a0f
am: 1847a6c406

* commit '1847a6c406186246b275e7a6b6f05dcebaf2cbdd':
  NFC antenna location asset.
2016-03-11 08:47:56 +00:00
Martijn Coenen
262a8f2a0f Merge "NFC antenna location asset." into nyc-dev 2016-03-11 08:39:00 +00:00
Lajos Molnar
f95ec89db2 Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev am: 79c1bc8434
am: 9c5a5f0930

* commit '9c5a5f09307ae2d099b34cb0468860a1020327bb':
  media: expose MediaFormat.KEY_HDR_STATIC_INFO key
2016-03-11 01:56:57 +00:00
Lajos Molnar
79c1bc8434 Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev 2016-03-11 01:44:28 +00:00
Narayan Kamath
05c7a63a6a Merge "Fix build broken by dfce17570e74e94404395a802." am: 512563d6cd
am: ef48bcb2e8

* commit 'ef48bcb2e80b3d9aa93feaf1dd18ce0b7add8355':
  Fix build broken by dfce17570e74e94404395a802.
2016-03-10 17:54:12 +00:00
Narayan Kamath
ef48bcb2e8 Merge "Fix build broken by dfce17570e74e94404395a802."
am: 512563d6cd

* commit '512563d6cd64b2c627a1899c09c107d0c27a7bdf':
  Fix build broken by dfce17570e74e94404395a802.
2016-03-10 17:50:19 +00:00
Narayan Kamath
b467f2c2a0 Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." am: c2c0a5eae6
am: 048faf62e1

* commit '048faf62e12856e31026f01306a3cc49438c9413':
  Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
2016-03-10 17:50:08 +00:00
Narayan Kamath
048faf62e1 Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc."
am: c2c0a5eae6

* commit 'c2c0a5eae6411f99550c272d002e9558fb52369c':
  Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
2016-03-10 17:45:46 +00:00
Narayan Kamath
512563d6cd Merge "Fix build broken by dfce17570e74e94404395a802." 2016-03-10 17:42:54 +00:00
Narayan Kamath
109ff58c70 Fix build broken by dfce17570e74e94404395a802.
Change-Id: I2d6f944193919f19774f53db0678fa032878b396
2016-03-10 17:42:01 +00:00
Narayan Kamath
c2c0a5eae6 Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." 2016-03-10 17:39:34 +00:00
Narayan Kamath
11f1bb218a Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." into nyc-dev am: e41718d4f7
am: 10b9fb8556

* commit '10b9fb8556f6efdf4b015a7bf3daef654c3e0935':
  Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
2016-03-10 17:09:04 +00:00
Narayan Kamath
10b9fb8556 Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." into nyc-dev
am: e41718d4f7

* commit 'e41718d4f744ee8312585c9e78cb036c56d57c1b':
  Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
2016-03-10 17:07:02 +00:00
Yi Kong
2c71eb23ea Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714" into nyc-dev
am: e962db6a30

* commit 'e962db6a3072d071e02b3547588af130c2e6967d':
  Track libcore change b695412b529c8dced105867c6d9d7fd463a67714
2016-03-10 17:03:05 +00:00
Narayan Kamath
e41718d4f7 Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc." into nyc-dev 2016-03-10 17:02:22 +00:00
Yi Kong
e843a12b43 Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"
am: 5724cc331d

* commit '5724cc331d66b0a7b4f74cfea65cbe419162eec6':
  Track libcore change b695412b529c8dced105867c6d9d7fd463a67714
2016-03-10 17:01:04 +00:00
Yi Kong
5606b529bc Track libcore change b695412b529c8dced105867c6d9d7fd463a67714
Bug: 27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1
(cherry picked from commit 40f79bb542)
(cherry picked from commit bfd9479b2c)
2016-03-10 16:22:20 +00:00
Yi Kong
bfd9479b2c Track libcore change b695412b529c8dced105867c6d9d7fd463a67714
Bug: 27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1
(cherry picked from commit 40f79bb542)
2016-03-10 16:21:36 +00:00
Narayan Kamath
ad473e6017 Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
Also includes test-current.txt generated locally.

bug: 27426688

(cherry picked from commit 741ba661c4)

Change-Id: I12d99b925335c8926e9c4257ee743d25fda9452d
2016-03-10 16:20:48 +00:00
Narayan Kamath
741ba661c4 Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc.
bug: 27426688

Change-Id: I6419f2b846932cd089efee1e74400fba97992c92
2016-03-10 16:06:11 +00:00
Yi Kong
40f79bb542 Track libcore change b695412b529c8dced105867c6d9d7fd463a67714
Bug: 27427000
Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1
2016-03-10 15:36:41 +00:00
Martijn Coenen
842cae4441 NFC antenna location asset.
Bug: 25334866
Change-Id: I143c2645ef4f9e51f5fc4c374794e647b00859c0
2016-03-10 16:13:16 +01:00
Jaesung Chung
9f4be88593 Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev am: 89cb194542
am: 20f5cd3fcc

* commit '20f5cd3fccc377e1a769192197aa97971aefee45':
  ExifInterface: implement the serialzation for Exif IFD structures
2016-03-10 08:43:15 +00:00
Jaesung Chung
20f5cd3fcc Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev
am: 89cb194542

* commit '89cb1945424f1d4c7278d24cd09f0a8d09093883':
  ExifInterface: implement the serialzation for Exif IFD structures
2016-03-10 08:39:07 +00:00
Jaesung Chung
89cb194542 Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev 2016-03-10 08:35:24 +00:00
Jaesung Chung
86e552b9fa ExifInterface: implement the serialzation for Exif IFD structures
One image can have multiple image file directories, which stores the
attributes of the image, in Exif specification to save metadata.
In the old version, the all attributes from several image file
directories were combined in a one hash map eventually and were served
without distinction of the original IFD group.

In order to keep the original data as much as possible, it loads/saves
the attributes based on the original IFD group internally.

Bug: 26044456, Bug: 11224701
Change-Id: I416e4e79fd47461c9aa83ce13591ed1a5d42f26e
2016-03-10 15:51:41 +09:00
Joe Onorato
ca3cbc1d63 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev am: 04a72a2a51
am: af2d5fb699

* commit 'af2d5fb699e18378190139411c87046fa07be092':
  Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 01:02:12 +00:00
Joe Onorato
af2d5fb699 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
am: 04a72a2a51

* commit '04a72a2a51ce3d128959b2ba53b5c22576322e59':
  Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 00:58:30 +00:00
Joe Onorato
04a72a2a51 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev 2016-03-10 00:52:03 +00:00
Todd Kennedy
96e9c44d04 Merge "Update API" into nyc-dev am: 3d2e374e70
am: b8a2c46c85

* commit 'b8a2c46c85cf00490414c07a42fc84481280cda5':
  Update API
2016-03-10 00:16:31 +00:00
Todd Kennedy
b8a2c46c85 Merge "Update API" into nyc-dev
am: 3d2e374e70

* commit '3d2e374e70afb8566121ea72de726e3499aa81aa':
  Update API
2016-03-10 00:14:19 +00:00
Todd Kennedy
3d2e374e70 Merge "Update API" into nyc-dev 2016-03-10 00:08:58 +00:00
Todd Kennedy
ef342404c6 Update API
Change-Id: Ia1c913d1508d80489fcc0e01e5d10f72f8f9af5c
2016-03-09 16:08:09 -08:00
Joe Onorato
713fec85b8 Add an API for apps to get their System Health / Battery Stats data.
Change-Id: Ib27e1be469b826f6d83d73ce6024102bbdb1d47a
2016-03-09 15:47:24 -08:00
Makoto Onuki
108853ba12 Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
am: 027fd0ae95

* commit '027fd0ae9512b57ec13448d292609ad41ebd0bb6':
  ShortcutManager: add remaining APIs.
2016-03-09 22:35:38 +00:00
Makoto Onuki
027fd0ae95 Merge "ShortcutManager: add remaining APIs." into nyc-dev
am: 4a07c34ca8

* commit '4a07c34ca86fddb75332eba22a4d7b9bd48205db':
  ShortcutManager: add remaining APIs.
2016-03-09 22:33:35 +00:00
Makoto Onuki
4a07c34ca8 Merge "ShortcutManager: add remaining APIs." into nyc-dev 2016-03-09 22:28:45 +00:00
Lifu Tang
175cb175df Merge "Modified the API to make coverage test possible" into nyc-dev am: e1b5358bae
am: d70097b7c1

* commit 'd70097b7c14a9b227b8a9b4c976e3d35de6059eb':
  Modified the API to make coverage test possible
2016-03-09 22:02:23 +00:00
Lifu Tang
d70097b7c1 Merge "Modified the API to make coverage test possible" into nyc-dev
am: e1b5358bae

* commit 'e1b5358bae5a311f427767fcf4800c3f03ac6bc1':
  Modified the API to make coverage test possible
2016-03-09 21:58:11 +00:00
Lifu Tang
e1b5358bae Merge "Modified the API to make coverage test possible" into nyc-dev 2016-03-09 21:53:17 +00:00
Lifu Tang
0f1ab04516 Modified the API to make coverage test possible
Bug: 27462840
Change-Id: Idfd2c3c108b25f8be9046fd4bb72dbc57edc24bd
2016-03-09 11:32:43 -08:00
Alan Viverette
6e772459b0 Merge "Add missing annotations, getters to GradientDrawable" into nyc-dev am: 0dda14c671
am: 3976b199e5

* commit '3976b199e5e2895b0d66479068862810d61d317d':
  Add missing annotations, getters to GradientDrawable
2016-03-09 19:30:04 +00:00
Alan Viverette
3976b199e5 Merge "Add missing annotations, getters to GradientDrawable" into nyc-dev
am: 0dda14c671

* commit '0dda14c671e7c19841f963b0bc665da055738437':
  Add missing annotations, getters to GradientDrawable
2016-03-09 19:26:55 +00:00
Alan Viverette
5f63721a6c Add missing annotations, getters to GradientDrawable
Fixes getColor() NPE when colors array is null.

Bug: 27543512
Change-Id: Ieec8a2315d0a2e4ab0ddbe053bccdd8c43080857
2016-03-09 13:30:35 -05:00
Martijn Coenen
6e05f27bff Merge "API to query which cores are exclusively assigned." into nyc-dev am: 2612bbc0f5
am: a249556f80

* commit 'a249556f80a88aa359d44fd71d6c8163c6a5b064':
  API to query which cores are exclusively assigned.
2016-03-09 10:39:48 +00:00
Martijn Coenen
a249556f80 Merge "API to query which cores are exclusively assigned." into nyc-dev
am: 2612bbc0f5

* commit '2612bbc0f5ae5422ba3e8e685ae375b2b8626fda':
  API to query which cores are exclusively assigned.
2016-03-09 10:37:45 +00:00
Martijn Coenen
2612bbc0f5 Merge "API to query which cores are exclusively assigned." into nyc-dev 2016-03-09 10:31:03 +00:00
Shubham Ajmera
5e0f99afb6 Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" into nyc-dev am: 8710347fd9
am: 138d4b4ce1

* commit '138d4b4ce152fd03f1710938d10123febc233c5a':
  Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:12:25 +00:00
Shubham Ajmera
138d4b4ce1 Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" into nyc-dev
am: 8710347fd9

* commit '8710347fd96bc26c7f7760a261d8e889baf53ba2':
  Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:10:24 +00:00
Shubham Ajmera
955c9ddc46 Merge "Port OpenJDK8 java.util.*SummaryStatistics & add tests" am: 66ca5ac738
am: d7b16e3578

* commit 'd7b16e35784555b288265887f65209bd4343df59':
  Port OpenJDK8 java.util.*SummaryStatistics & add tests
2016-03-09 10:06:30 +00:00