Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,482 Commits 3 Branches 0 Tags
7b02468b34ed3501ef8707e71d8017a2df952329
Commit Graph

64571 Commits

Author SHA1 Message Date
Clara Bayarri
7b02468b34 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev am: 6e58549 
am: bdcd8dc

* commit 'bdcd8dce23ad83a696fc350374abde50ee91c6d0':
  Provide startIntentSenderForResult for fragments

Change-Id: I5746132388eabcf5e29a948cb36d30745ae73887
 2016-04-14 19:26:09 +00:00
Bernard Chau
60b73587bb Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7 
am: d17b301

* commit 'd17b3013ce7bd38aaf16d1ffd578d964bfd1808a':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I85630c13799c9bbaa558a0f1582691f7a00e0b86
 2016-04-14 18:52:53 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f 
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
 2016-04-14 18:52:01 +00:00
Pierre Imai
87421a21c7 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76 
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
 2016-04-14 18:51:38 +00:00
Zhijun He
497280cac9 Merge "Camera: clarify lens shading map" into nyc-dev am: 15aac69 
am: a197627

* commit 'a19762765d099acf9cd81105343f857b8845788d':
  Camera: clarify lens shading map

Change-Id: I8adc602a08dbb5521f57319fd2a80bffb305ef82
 2016-04-14 18:49:55 +00:00
Yuki Awano
2a68999d4f Do not update accessibilityTitle in LayoutParams.setTitle am: 0697c7a 
am: b28d871

* commit 'b28d871a8dc1ae3f78ac6587272f8c8454718188':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: Ie6ce4e042ea3a14e7ed66dad89f4d879e128869b
 2016-04-14 18:48:54 +00:00
TreeHugger Robot
b03419e212 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev am: f824e58 
am: 48f8f29

* commit '48f8f2951bf54dcf998916e915e150f782088c71':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Idda93d8b3c1b3d6a12d3958627fb291f647b18dd
 2016-04-14 18:45:53 +00:00
Alan Viverette
3d7cabbf5a Merge "Add scroll indicators to resolver list" into nyc-dev am: 8bb7ad5 
am: 3b049bb

* commit '3b049bb17fd10357005a069c0693c6d50c0023df':
  Add scroll indicators to resolver list

Change-Id: I984a1344f3f4d5861d276bba6a1cc94217b6a688
 2016-04-14 18:45:16 +00:00
TreeHugger Robot
382987244e Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev am: c1699a9 
am: f917e2f

* commit 'f917e2f738f25bcf34ffa073008e872d803458e1':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I4273c7fe4511b8a542f15b604387e6f27ee6d676
 2016-04-14 18:36:38 +00:00
TreeHugger Robot
71f8c4c475 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev am: c142a8c 
am: 69df48c

* commit '69df48c44602f0ab64725dd82444fda23bc7f2bf':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Idf437251b407c2682e6f52608031178aa1040eeb
 2016-04-14 18:33:55 +00:00
Joe Onorato
075bb7e3f4 Merge commit '034b58c2f53a9101395b2cd8cd4e01be9f93c2b2' into manual_merge_034b58c 
More work on issue #26390151: Add new JobScheduler API...

...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: I709bd7c77e1b5ffb012e36149a739ecb245dd5cd
 2016-04-14 10:27:31 -07:00
Kirill Grouchnikov
698b751dc7 Add @TestApi-guarded way to get bounds of specific day in CalendarView 
Two separate implementation paths, one for Material look / layout, and
one for legacy / pre-Material one.

Bug: 28037149
Change-Id: Id1946802c0a93218d9eb0b73c81ad76dc027763c
 2016-04-14 08:47:05 -04:00
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
 2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Bernard Chau
d17b3013ce Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev 
am: 25c43b7

* commit '25c43b78d11f74e98ba9d5f541647aa5ed44ebce':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I23eeef915a4607aa387e826056056cb7632a4542
 2016-04-14 09:45:55 +00:00
Bernard Chau
25c43b78d1 Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev 2016-04-14 09:40:00 +00:00
Hugo Benichi
39de1e2de5 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 
am: fc18b6f

* commit 'fc18b6f3608d87f3dc53cda8d8db30636c92d6e9':
  Add DHCP error event class and record DHCP errors.

Change-Id: I5b9ef8b191ab0ef4349ed00c1d8f548393aba368
 2016-04-14 08:08:54 +00:00
Hugo Benichi
fc18b6f360 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 2016-04-14 08:01:31 +00:00
Pierre Imai
f8ef3c36a9 Merge changes Ia71865a9,I40b6de54 into nyc-dev 
am: 1feca76

* commit '1feca76bd48008aa3421c8741cb147ecc1a6e912':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: I2aea598dd2926c18fdb4e6301759539c504038dc
 2016-04-14 07:31:38 +00:00
Pierre Imai
1feca76bd4 Merge changes Ia71865a9,I40b6de54 into nyc-dev 
* changes:
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.
 2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355 Add DHCP error event class and record DHCP errors. 
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.

Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
 2016-04-14 15:40:10 +09:00
Pierre Imai
6b4e15b155 Record the transport types for connectivity events. 
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
 2016-04-14 15:38:17 +09:00
Zhijun He
a19762765d Merge "Camera: clarify lens shading map" into nyc-dev 
am: 15aac69

* commit '15aac69c8f16e5edd62fd6557cf6ffb5e04b351e':
  Camera: clarify lens shading map

Change-Id: I403577261078949cb30c0a66390e833108d3b98f
 2016-04-14 05:26:18 +00:00
Zhijun He
15aac69c8f Merge "Camera: clarify lens shading map" into nyc-dev 2016-04-14 05:20:45 +00:00
Yuki Awano
b28d871a8d Do not update accessibilityTitle in LayoutParams.setTitle 
am: 0697c7a

* commit '0697c7a877d87acd572ed7ce62472d5866375e86':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: I006620e1ac9c8571dd698f45da75284010dc58e9
 2016-04-14 04:21:55 +00:00
Yuki Awano
0697c7a877 Do not update accessibilityTitle in 
LayoutParams.setTitle

Bug: 28126629
Change-Id: Idfd8c0210d32e1a0e9c16272cfbb35ef6065e805
 2016-04-14 04:16:18 +00:00
Erik Kline
48f8f2951b Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev 
am: f824e58

* commit 'f824e58d493bb86789bcb8de27a2e43a762c5d3e':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Icc62c058b26a8b31f3651569371dbb231cef4502
 2016-04-14 03:27:17 +00:00
TreeHugger Robot
f824e58d49 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev 2016-04-14 03:20:40 +00:00
Erik Kline
5b25a0f796 Add some more metrics: IpManager, IpReachabilityMonitor 
Change-Id: Ibb7150c849715a42fc2c879589eaaf86e8a007e7
 2016-04-14 10:53:30 +09:00
Alan Viverette
3b049bb17f Merge "Add scroll indicators to resolver list" into nyc-dev 
am: 8bb7ad5

* commit '8bb7ad598560fda42ec256f02ba69cf54b433a85':
  Add scroll indicators to resolver list

Change-Id: I8b6dbcd2ff106bf83945084b1a4956c094234240
 2016-04-14 01:49:33 +00:00
Alan Viverette
8bb7ad5985 Merge "Add scroll indicators to resolver list" into nyc-dev 2016-04-14 01:45:35 +00:00
Steven Dao
f917e2f738 Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev 
am: c1699a9

* commit 'c1699a9f4cf679ebc87e5b5bc99dd07446950be7':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I0227f6b9a842fa1e63827cda51e0cb5a435e278e
 2016-04-14 00:34:13 +00:00
TreeHugger Robot
c1699a9f4c Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev 2016-04-14 00:28:28 +00:00
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev 
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
 2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Dianne Hackborn
034b58c2f5 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 
am: 9e31b3f

* commit '9e31b3fd817aed28d9afd712fa49ec9d6fc11329':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I7c227898d175c15219192fc42c5e4eb5121e9517
 2016-04-13 23:37:31 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Doris Liu
db976a28c4 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev am: c5801fb 
am: f4b5a9d

* commit 'f4b5a9d7f6c56198bcbdceed52e077df62c37be7':
  Add api check to guard AnimatorSet behavior change

Change-Id: I020000d1f7fc90e25ecef91470dc599e417b4a4e
 2016-04-13 23:26:58 +00:00
Junda Liu
aaa2251da0 Merge "Add toString to CarrierIdentifier." into nyc-dev am: 71f69a7 
am: ea15981

* commit 'ea1598173a82d1f139b0e192c38f8c28d751dcbd':
  Add toString to CarrierIdentifier.

Change-Id: I5aca439c4924a23ed0303e257d5a330b3f4dfb7c
 2016-04-13 23:26:55 +00:00
Doris Liu
f59107185b Merge "Skip to end for 0-duration animation" into nyc-dev am: 1dfe35b 
am: 677b2c6

* commit '677b2c60aa5bd41b856762d223161220476844bb':
  Skip to end for 0-duration animation

Change-Id: Ibc359887f4d96a84742e4369bb0059c1ece1afc1
 2016-04-13 23:19:46 +00:00
Doris Liu
f4b5a9d7f6 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev 
am: c5801fb

* commit 'c5801fb9333823f08889f82eb4679638d18d6863':
  Add api check to guard AnimatorSet behavior change

Change-Id: If3d6417d60c70161869e41aa94f89e2afee9bd33
 2016-04-13 23:19:43 +00:00
Jonathan Basseri
ea1598173a Merge "Add toString to CarrierIdentifier." into nyc-dev 
am: 71f69a7

* commit '71f69a71ffd77367a53721fcaed015cba942f5c3':
  Add toString to CarrierIdentifier.

Change-Id: I1b0d7e0d117b0aa10482ec0ddc52a4531e570b70
 2016-04-13 23:19:41 +00:00
Doris Liu
c5801fb933 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev 2016-04-13 23:15:33 +00:00
Junda Liu
71f69a71ff Merge "Add toString to CarrierIdentifier." into nyc-dev 2016-04-13 23:14:41 +00:00
Doris Liu
677b2c60aa Merge "Skip to end for 0-duration animation" into nyc-dev 
am: 1dfe35b

* commit '1dfe35b8a797f921d095beeaf1018f7a987e8343':
  Skip to end for 0-duration animation

Change-Id: I22f0cbf98b69b24b07de001bfebb86ad06c2170b
 2016-04-13 23:13:21 +00:00
Doris Liu
1dfe35b8a7 Merge "Skip to end for 0-duration animation" into nyc-dev 2016-04-13 23:03:30 +00:00
Adrian Roos
4ab7e595a5 StrongAuthTracker: Don't rely on USER_PRESENT 
USER_PRESENT is sent via the background queue. A delay
there can cause us not to recognize that the user has
unlocked and prompt for the credential again, when trust
or fingerprint would be sufficient.

Also removes an obsolete reference to USER_PRESENT from
TrustManagerService.

Change-Id: Ie8d1a180170df5f0c8f9e71660504fd71eeacd99
Fixes: 27830458
 2016-04-13 15:38:18 -07:00
Adam Lesinski
f2489ad456 Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev am: b5abb78 
am: eaf83ef

* commit 'eaf83ef61b33383ae47d1e2e96e99d7d312d2d3b':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: If52c56fbc0ffff43e5eb836aacd11f3f8764e4c7
 2016-04-13 22:37:08 +00:00
Steven Dao
24142819b8 Populate RangeInfo correctly when acquiring from pool 
Bug: 27136599
Change-Id: I836b2ae3bf9b2ed5fc4afeb744e2cf3a500cc4a4
 2016-04-13 15:30:00 -07:00
Adam Lesinski
eaf83ef61b Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 
am: b5abb78

* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
 2016-04-13 22:25:45 +00:00